LU-6593 kernel: kernel update [RHEL7.1 3.10.0-229.4.2.el7]

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

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index a669f56..6fb292f 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -264,8 +264,14 @@ static int server_stop_mgs(struct super_block *sb)
 {
        struct obd_device *obd;
        int rc;
+       struct lustre_mount_info *lmi;
        ENTRY;
 
+       /* Do not stop MGS if this device is not the running MGT */
+       lmi = server_find_mount(LUSTRE_MGS_OBDNAME);
+       if (lmi != NULL && lmi->lmi_sb != sb)
+               RETURN(0);
+
        CDEBUG(D_MOUNT, "Stop MGS service %s\n", LUSTRE_MGS_OBDNAME);
 
        /* There better be only one MGS */
@@ -1047,7 +1053,6 @@ int server_mti_print(const char *title, struct mgs_target_info *mti)
                  mti->mti_config_ver, mti->mti_flags);
        return 0;
 }
-EXPORT_SYMBOL(server_mti_print);
 
 /* Generate data for registration */
 static int server_lsi2mti(struct lustre_sb_info *lsi,
@@ -1164,8 +1169,8 @@ static int server_register_target(struct lustre_sb_info *lsi)
                                "rc = %d. Is the MGS running?\n",
                                lsi->lsi_svname, rc);
                } else {
-                       CERROR("%s: error registering with the MGS: rc = %d "
-                              "(not fatal)\n", lsi->lsi_svname, rc);
+                       CDEBUG(D_HA, "%s: error registering with the MGS: "
+                              "rc = %d (not fatal)\n", lsi->lsi_svname, rc);
                        /* reset the error code for non-fatal error. */
                        rc = 0;
                }
@@ -1868,4 +1873,3 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
        obd->obd_recovery_time_hard = hard;
        obd->obd_recovery_ir_factor = factor;
 }
-EXPORT_SYMBOL(server_calc_timeout);