Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull mount flag updates from Al Viro:
 "Another chunk of fmount preparations from dhowells; only trivial
  conflicts for that part. It separates MS_... bits (very grotty
  mount(2) ABI) from the struct super_block ->s_flags (kernel-internal,
  only a small subset of MS_... stuff).

  This does *not* convert the filesystems to new constants; only the
  infrastructure is done here. The next step in that series is where the
  conflicts would be; that's the conversion of filesystems. It's purely
  mechanical and it's better done after the merge, so if you could run
  something like

	list=$(for i in MS_RDONLY MS_NOSUID MS_NODEV MS_NOEXEC MS_SYNCHRONOUS MS_MANDLOCK MS_DIRSYNC MS_NOATIME MS_NODIRATIME MS_SILENT MS_POSIXACL MS_KERNMOUNT MS_I_VERSION MS_LAZYTIME; do git grep -l $i fs drivers/staging/lustre drivers/mtd ipc mm include/linux; done|sort|uniq|grep -v '^fs/namespace.c$')

	sed -i -e 's/\<MS_RDONLY\>/SB_RDONLY/g' \
	        -e 's/\<MS_NOSUID\>/SB_NOSUID/g' \
	        -e 's/\<MS_NODEV\>/SB_NODEV/g' \
	        -e 's/\<MS_NOEXEC\>/SB_NOEXEC/g' \
	        -e 's/\<MS_SYNCHRONOUS\>/SB_SYNCHRONOUS/g' \
	        -e 's/\<MS_MANDLOCK\>/SB_MANDLOCK/g' \
	        -e 's/\<MS_DIRSYNC\>/SB_DIRSYNC/g' \
	        -e 's/\<MS_NOATIME\>/SB_NOATIME/g' \
	        -e 's/\<MS_NODIRATIME\>/SB_NODIRATIME/g' \
	        -e 's/\<MS_SILENT\>/SB_SILENT/g' \
	        -e 's/\<MS_POSIXACL\>/SB_POSIXACL/g' \
	        -e 's/\<MS_KERNMOUNT\>/SB_KERNMOUNT/g' \
	        -e 's/\<MS_I_VERSION\>/SB_I_VERSION/g' \
	        -e 's/\<MS_LAZYTIME\>/SB_LAZYTIME/g' \
	        $list

  and commit it with something along the lines of 'convert filesystems
  away from use of MS_... constants' as commit message, it would save a
  quite a bit of headache next cycle"

* 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  VFS: Differentiate mount flags (MS_*) from internal superblock flags
  VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)
  vfs: Add sb_rdonly(sb) to query the MS_RDONLY flag on s_flags

1 files changed, 6 insertions, 9 deletions

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index 3f936be379a9..80733496b22a 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -675,7 +675,7 @@ static int ocfs2_remount(struct super_block *sb, int *flags, char *data)
         }
 
         /* We're going to/from readonly mode. */
-        if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) {
+        if ((bool)(*flags & MS_RDONLY) != sb_rdonly(sb)) {
                 /* Disable quota accounting before remounting RO */
                 if (*flags & MS_RDONLY) {
                         ret = ocfs2_susp_quotas(osb, 0);
@@ -1063,7 +1063,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         /* Hard readonly mode only if: bdev_read_only, MS_RDONLY,
          * heartbeat=none */
         if (bdev_read_only(sb->s_bdev)) {
-                if (!(sb->s_flags & MS_RDONLY)) {
+                if (!sb_rdonly(sb)) {
                         status = -EACCES;
                         mlog(ML_ERROR, "Readonly device detected but readonly "
                              "mount was not specified.\n");
@@ -1098,7 +1098,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         }
 
         if (!ocfs2_is_hard_readonly(osb)) {
-                if (sb->s_flags & MS_RDONLY)
+                if (sb_rdonly(sb))
                         ocfs2_set_ro_flag(osb, 0);
         }
 
@@ -1179,7 +1179,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent)
         /* Now we can initialize quotas because we can afford to wait
          * for cluster locks recovery now. That also means that truncation
          * log recovery can happen but that waits for proper quota setup */
-        if (!(sb->s_flags & MS_RDONLY)) {
+        if (!sb_rdonly(sb)) {
                 status = ocfs2_enable_quotas(osb);
                 if (status < 0) {
                         /* We have to err-out specially here because
@@ -2180,8 +2180,7 @@ static int ocfs2_initialize_super(struct super_block *sb,
                 status = -EINVAL;
                 goto bail;
         }
-        if (!(osb->sb->s_flags & MS_RDONLY) &&
-            (i = OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, ~OCFS2_FEATURE_RO_COMPAT_SUPP))) {
+        if (!sb_rdonly(osb->sb) && (i = OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, ~OCFS2_FEATURE_RO_COMPAT_SUPP))) {
                 mlog(ML_ERROR, "couldn't mount RDWR because of "
                      "unsupported optional features (%x).\n", i);
                 status = -EINVAL;
@@ -2567,9 +2566,7 @@ static int ocfs2_handle_error(struct super_block *sb)
                 rv = -EIO;
         } else { /* default option */
                 rv = -EROFS;
-                if (sb->s_flags & MS_RDONLY &&
-                                (ocfs2_is_soft_readonly(osb) ||
-                                 ocfs2_is_hard_readonly(osb)))
+                if (sb_rdonly(sb) && (ocfs2_is_soft_readonly(osb) || ocfs2_is_hard_readonly(osb)))
                         return rv;
 
                 pr_crit("OCFS2: File system is now read-only.\n");