From: Cedric Le Goater <clg@fr.ibm.com>

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
---
 include/linux/fs.h    |    9 +++++++++
 include/linux/mount.h |   11 -----------
 2 files changed, 9 insertions(+), 11 deletions(-)

Index: 2.6.22-rc4-mm2-robindmount/include/linux/fs.h
===================================================================
--- 2.6.22-rc4-mm2-robindmount.orig/include/linux/fs.h
+++ 2.6.22-rc4-mm2-robindmount/include/linux/fs.h
@@ -1104,6 +1104,15 @@ struct super_block {
 extern struct timespec current_fs_time(struct super_block *sb);
 
 /*
+ * This shouldn't be used directly ouside of the VFS,
+ * use mnt_want/drop_write() instead.
+ */
+static inline int __mnt_is_readonly(struct vfsmount *mnt)
+{
+	return (mnt->mnt_sb->s_flags & MS_RDONLY);
+}
+
+/*
  * Snapshotting support.
  */
 enum {
Index: 2.6.22-rc4-mm2-robindmount/include/linux/mount.h
===================================================================
--- 2.6.22-rc4-mm2-robindmount.orig/include/linux/mount.h
+++ 2.6.22-rc4-mm2-robindmount/include/linux/mount.h
@@ -74,17 +74,6 @@ static inline struct vfsmount *mntget(st
 	return mnt;
 }
 
-#include <linux/fs.h>
-
-/*
- * This shouldn't be used directly ouside of the VFS,
- * use mnt_want/drop_write() instead.
- */
-static inline int __mnt_is_readonly(struct vfsmount *mnt)
-{
-	return (mnt->mnt_sb->s_flags & MS_RDONLY);
-}
-
 extern int mnt_want_write(struct vfsmount *mnt);
 extern void mnt_drop_write(struct vfsmount *mnt);
 extern void mntput_no_expire(struct vfsmount *mnt);

-- 
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers