X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_mount.c;h=890d409737d09a72837ce47cfcb7d60d3d26fe0c;hp=85f0e677b138ff3fdc42da5e92d4f410a01ede2f;hb=921fa0f21c1722e127fd072089ee35ddb0135653;hpb=b2a487553e966d8d93a8ad5e54c8ffcce37b9954 diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 85f0e67..890d409 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -1617,23 +1617,8 @@ static void server_put_super(struct super_block *sb) should have put it on a different device. */ if (IS_MGS(lsi->lsi_ldd)) { /* if MDS start with --nomgs, don't stop MGS then */ - if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) { - char *logname; - - OBD_ALLOC(logname, MGS_PARAM_MAXLEN); - if (!logname) { - LCONSOLE_WARN("Stopping mgs failed %d, please " - "try again.", -ENOMEM); - return; - } - strcpy(logname, lsi->lsi_ldd->ldd_fsname); - strcat(logname, "-params"); - /* tell the mgc to drop parameter config log */ - lustre_end_log(sb, logname, NULL); - OBD_FREE(logname, MGS_PARAM_MAXLEN); - + if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) server_stop_mgs(sb); - } } /* Clean the mgc and sb */ @@ -1846,25 +1831,6 @@ static int server_fill_super(struct super_block *sb) Client will not finish until all servers are connected. Note - MGS-only server does NOT get a client, since there is no lustre fs associated - the MGS is for all lustre fs's */ - } else if (IS_MGS(lsi->lsi_ldd) && - !(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)){ - struct config_llog_instance cfg; - char *logname; - - OBD_ALLOC(logname, MGS_PARAM_MAXLEN); - if (logname == NULL) - GOTO(out_mnt, rc = -ENOMEM); - strcpy(logname, lsi->lsi_ldd->ldd_fsname); - strcat(logname, "-params"); - - memset(&cfg, 0, sizeof(cfg)); - rc = lustre_process_log(sb, logname, &cfg); - OBD_FREE(logname, MGS_PARAM_MAXLEN); - if (rc) { - CERROR("failed to process parameters %s: %d\n", - logname, rc); - GOTO(out_mnt, rc); - } } rc = server_fill_super_common(sb);