LU-13356 client: don't use OBD_CONNECT_MNE_SWAB

[fs/lustre-release.git] / lustre / obdclass / obd_mount.c

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 1d37c9d..de23440 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -469,10 +469,6 @@ int lustre_start_mgc(struct super_block *sb)
                                  OBD_CONNECT_LVB_TYPE |
                                  OBD_CONNECT_BULK_MBITS | OBD_CONNECT_BARRIER;
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)
-       data->ocd_connect_flags |= OBD_CONNECT_MNE_SWAB;
-#endif
-
        if (lmd_is_client(lsi->lsi_lmd) &&
            lsi->lsi_lmd->lmd_flags & LMD_FLG_NOIR)
                data->ocd_connect_flags &= ~OBD_CONNECT_IMP_RECOV;
@@ -1454,6 +1450,9 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
                        strlcat(lmd->lmd_params, " ", LMD_PARAMS_MAXLEN);
                        s3 = s1 + 6 + length;
                        clear++;
+               } else if (strncmp(s1, "localrecov", 10) == 0) {
+                       lmd->lmd_flags |= LMD_FLG_LOCAL_RECOV;
+                       clear++;
                } else if (strncmp(s1, "osd=", 4) == 0) {
                        rc = lmd_parse_string(&lmd->lmd_osd_type, s1 + 4);
                        if (rc)
@@ -1702,19 +1701,11 @@ void lustre_register_super_ops(struct module *mod,
 EXPORT_SYMBOL(lustre_register_super_ops);
 
 /***************** FS registration ******************/
-#ifdef HAVE_FSTYPE_MOUNT
 static struct dentry *lustre_mount(struct file_system_type *fs_type, int flags,
                                   const char *devname, void *data)
 {
        return mount_nodev(fs_type, flags, data, lustre_fill_super);
 }
-#else
-static int lustre_get_sb(struct file_system_type *fs_type, int flags,
-                        const char *devname, void *data, struct vfsmount *mnt)
-{
-       return get_sb_nodev(fs_type, flags, data, lustre_fill_super, mnt);
-}
-#endif
 
 static void lustre_kill_super(struct super_block *sb)
 {
@@ -1740,11 +1731,7 @@ static void lustre_kill_super(struct super_block *sb)
 static struct file_system_type lustre_fs_type_tgt = {
        .owner          = THIS_MODULE,
        .name           = "lustre_tgt",
-#ifdef HAVE_FSTYPE_MOUNT
        .mount          = lustre_mount,
-#else
-       .get_sb         = lustre_get_sb,
-#endif
        .kill_sb        = lustre_kill_super,
        .fs_flags       = FS_REQUIRES_DEV | FS_RENAME_DOES_D_MOVE,
 };
@@ -1772,11 +1759,7 @@ do {                                                                         \
 static struct file_system_type lustre_fs_type = {
        .owner          = THIS_MODULE,
        .name           = "lustre",
-#ifdef HAVE_FSTYPE_MOUNT
        .mount          = lustre_mount,
-#else
-       .get_sb         = lustre_get_sb,
-#endif
        .kill_sb        = lustre_kill_super,
        .fs_flags       = FS_RENAME_DOES_D_MOVE,
 };