X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Futils%2Fmkfs_lustre.c;h=ceed41d809684fb44dadb5cb2d3f72f0fec39305;hb=e542ab2a0b40f4f53d4b8cbd1013ea1d46e9574f;hp=001a051ac54a87cb8d641d796b80285ca95801c8;hpb=9d72ec94b56590ad5da7003e93dd268d81fc8d14;p=fs%2Flustre-release.git

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 001a051..ceed41d 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -661,27 +661,15 @@ int main(int argc, char *const argv[])
 		mop.mo_ldd.ldd_flags &= ~LDD_F_NEED_INDEX;
 		mop.mo_ldd.ldd_svindex = 0;
 	}
-
-#if 0
-        /*
-         * Comment out these 2 checks temporarily, since for multi-MDSes
-         * in single node only 1 mds node could have mgs service
-         */
-        if (IS_MDT(ldd) && !IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) {
-                verrprint("No management node specified, adding MGS to this "
-                          "MDT\n");
-                ldd->ldd_flags |= LDD_F_SV_TYPE_MGS;
-        }
-        if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) {
-                fatal();
-                if (IS_MDT(ldd))
-                        fprintf(stderr, "Must specify --mgs or --mgsnode=\n");
-                else
-                        fprintf(stderr, "Must specify --mgsnode=\n");
-                ret = EINVAL;
-                goto out;
-        }
-#endif
+	if (!IS_MGS(ldd) && (mop.mo_mgs_failnodes == 0)) {
+		fatal();
+		if (IS_MDT(ldd))
+			fprintf(stderr, "Must specify --mgs or --mgsnode\n");
+		else
+			fprintf(stderr, "Must specify --mgsnode\n");
+		ret = EINVAL;
+		goto out;
+	}
 	if ((IS_MDT(ldd) || IS_OST(ldd)) && mop.mo_ldd.ldd_fsname[0] == '\0') {
 		fatal();
 		fprintf(stderr, "Must specify --fsname for MDT/OST device\n");