From fbe8df58a4609e652ad55d0ae5ba87fe5e6ce520 Mon Sep 17 00:00:00 2001
From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 23:44:42 +0000
Subject: [PATCH] - remove redundant merge conflict
---
include/linux/ext3_fs.h | 3 ---
include/linux/fs.h | 1 -
include/linux/mount.h | 4 ----
3 files changed, 8 deletions(-)
diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 48f0c6122..ed20662e0 100644
--- 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 63aa1452a..f18190605 100644
--- 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 262a55e2e..07d42ab88 100644
--- 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)
--
2.47.0