LU-6275 obdclass: don't forget to remove LWP mgc config

[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 d89be15..a236d16 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -539,7 +539,8 @@ static int lustre_lwp_connect(struct obd_device *lwp)
        data->ocd_connect_flags |= OBD_CONNECT_MDS_MDS | OBD_CONNECT_FID |
                OBD_CONNECT_AT | OBD_CONNECT_LRU_RESIZE |
                OBD_CONNECT_FULL20 | OBD_CONNECT_LVB_TYPE |
-               OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_LFSCK;
+               OBD_CONNECT_LIGHTWEIGHT | OBD_CONNECT_LFSCK |
+               OBD_CONNECT_BULK_MBITS;
        OBD_ALLOC_PTR(uuid);
        if (uuid == NULL)
                GOTO(out, rc = -ENOMEM);
@@ -883,7 +884,7 @@ static int lustre_disconnect_lwp(struct super_block *sb)
                /* end log first */
                cfg->cfg_instance = sb;
                rc = lustre_end_log(sb, logname, cfg);
-               if (rc != 0)
+               if (rc != 0 && rc != -ENOENT)
                        GOTO(out, rc);
 
                lsi->lsi_lwp_started = 0;
@@ -992,8 +993,8 @@ static int lustre_start_lwp(struct super_block *sb)
        cfg->cfg_callback = client_lwp_config_process;
        cfg->cfg_instance = sb;
        rc = lustre_process_log(sb, logname, cfg);
-       if (rc == 0)
-               lsi->lsi_lwp_started = 1;
+       /* need to remove config llog from mgc */
+       lsi->lsi_lwp_started = 1;
 
        GOTO(out, rc);
 
@@ -1169,8 +1170,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;
                }