Linux 5.0 compat: Convert MS_* macros to SB_*

In the 5.0 kernel, only the mount namespace code should use the MS_*
macos. Filesystems should use the SB_* ones.

https://patchwork.kernel.org/patch/10552493/

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #8264

diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
index d13f365dd055d3e72d257d195a1cd5cea72f34d6..c53a0aa0fcbe8b95927a36337200a0c0db3631fe 100644 (file)
--- a/module/zfs/vdev_disk.c
+++ b/module/zfs/vdev_disk.c
@@ -35,6 +35,7 @@
 #include <sys/zio.h>
 #include <linux/mod_compat.h>
 #include <linux/msdos_fs.h>
+#include <linux/vfs_compat.h>
 
 char *zfs_vdev_scheduler = VDEV_SCHEDULER;
 static void *zfs_vdev_holder = VDEV_HOLDER;
@@ -79,7 +80,7 @@ vdev_bdev_mode(int smode)
        ASSERT3S(smode & (FREAD | FWRITE), !=, 0);
 
        if ((smode & FREAD) && !(smode & FWRITE))
-               mode = MS_RDONLY;
+               mode = SB_RDONLY;
 
        return (mode);
 }

diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
index c9e314caa223e2852c0ec78a694386bae7ce0bac..766cbab7436fc372d2a557452b5ffb843ee470db 100644 (file)
--- a/module/zfs/zfs_vfsops.c
+++ b/module/zfs/zfs_vfsops.c
@@ -56,6 +56,7 @@
 #include <sys/dmu_objset.h>
 #include <sys/spa_boot.h>
 #include <sys/zpl.h>
+#include <linux/vfs_compat.h>
 #include "zfs_comutil.h"
 
 enum {
@@ -249,7 +250,7 @@ zfsvfs_parse_options(char *mntopts, vfs_t **vfsp)
 boolean_t
 zfs_is_readonly(zfsvfs_t *zfsvfs)
 {
-       return (!!(zfsvfs->z_sb->s_flags & MS_RDONLY));
+       return (!!(zfsvfs->z_sb->s_flags & SB_RDONLY));
 }
 
 /*ARGSUSED*/
@@ -336,15 +337,15 @@ acltype_changed_cb(void *arg, uint64_t newval)
        switch (newval) {
        case ZFS_ACLTYPE_OFF:
                zfsvfs->z_acl_type = ZFS_ACLTYPE_OFF;
-               zfsvfs->z_sb->s_flags &= ~MS_POSIXACL;
+               zfsvfs->z_sb->s_flags &= ~SB_POSIXACL;
                break;
        case ZFS_ACLTYPE_POSIXACL:
 #ifdef CONFIG_FS_POSIX_ACL
                zfsvfs->z_acl_type = ZFS_ACLTYPE_POSIXACL;
-               zfsvfs->z_sb->s_flags |= MS_POSIXACL;
+               zfsvfs->z_sb->s_flags |= SB_POSIXACL;
 #else
                zfsvfs->z_acl_type = ZFS_ACLTYPE_OFF;
-               zfsvfs->z_sb->s_flags &= ~MS_POSIXACL;
+               zfsvfs->z_sb->s_flags &= ~SB_POSIXACL;
 #endif /* CONFIG_FS_POSIX_ACL */
                break;
        default:
@@ -373,9 +374,9 @@ readonly_changed_cb(void *arg, uint64_t newval)
                return;
 
        if (newval)
-               sb->s_flags |= MS_RDONLY;
+               sb->s_flags |= SB_RDONLY;
        else
-               sb->s_flags &= ~MS_RDONLY;
+               sb->s_flags &= ~SB_RDONLY;
 }
 
 static void
@@ -403,9 +404,9 @@ nbmand_changed_cb(void *arg, uint64_t newval)
                return;
 
        if (newval == TRUE)
-               sb->s_flags |= MS_MANDLOCK;
+               sb->s_flags |= SB_MANDLOCK;
        else
-               sb->s_flags &= ~MS_MANDLOCK;
+               sb->s_flags &= ~SB_MANDLOCK;
 }
 
 static void
@@ -1954,8 +1955,8 @@ zfs_remount(struct super_block *sb, int *flags, zfs_mnt_t *zm)
        int error;
 
        if ((issnap || !spa_writeable(dmu_objset_spa(zfsvfs->z_os))) &&
-           !(*flags & MS_RDONLY)) {
-               *flags |= MS_RDONLY;
+           !(*flags & SB_RDONLY)) {
+               *flags |= SB_RDONLY;
                return (EROFS);
        }
 
@@ -1963,7 +1964,7 @@ zfs_remount(struct super_block *sb, int *flags, zfs_mnt_t *zm)
        if (error)
                return (error);
 
-       if (!zfs_is_readonly(zfsvfs) && (*flags & MS_RDONLY))
+       if (!zfs_is_readonly(zfsvfs) && (*flags & SB_RDONLY))
                txg_wait_synced(dmu_objset_pool(zfsvfs->z_os), 0);
 
        zfs_unregister_callbacks(zfsvfs);