- remove redundant merge conflict

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 48f0c61..ed20662 100644 (file)
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -246,9 +246,6 @@ struct ext3_new_group_data {
 #ifdef CONFIG_JBD_DEBUG
 #define EXT3_IOC_WAIT_FOR_READONLY     _IOR('f', 99, long)
 #endif
-#ifdef CONFIG_VSERVER_LEGACY
-#define EXT3_IOC_SETXID                        FIOC_SETXIDJ
-#endif
 #define EXT3_IOC_GETRSVSZ              _IOR('f', 5, long)
 #define EXT3_IOC_SETRSVSZ              _IOW('f', 6, long)
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 63aa145..f181906 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -221,7 +221,6 @@ extern int dir_notify_enable;
 #include <linux/radix-tree.h>
 #include <linux/prio_tree.h>
 #include <linux/init.h>
-#include <linux/mount.h>
 
 #include <asm/atomic.h>
 #include <asm/semaphore.h>

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 262a55e..07d42ab 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -47,10 +47,6 @@ struct vfsmount
 #define        MNT_IS_NOATIME(m)       ((m) && ((m)->mnt_flags & MNT_NOATIME))
 #define        MNT_IS_NODIRATIME(m)    ((m) && ((m)->mnt_flags & MNT_NODIRATIME))
 
-#define        MNT_IS_RDONLY(m)        ((m) && ((m)->mnt_flags & MNT_RDONLY))
-#define        MNT_IS_NOATIME(m)       ((m) && ((m)->mnt_flags & MNT_NOATIME))
-#define        MNT_IS_NODIRATIME(m)    ((m) && ((m)->mnt_flags & MNT_NODIRATIME))
-
 static inline struct vfsmount *mntget(struct vfsmount *mnt)
 {
        if (mnt)