X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fmkfs_lustre.c;h=53102768480e36e418cb82f3df7195f3bf362992;hp=ceed41d809684fb44dadb5cb2d3f72f0fec39305;hb=593b6ab6d21976d37004621b86f37715df697e9e;hpb=e92b9f84c11f6298401a0e73b09cf36a982f4fbe

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index ceed41d..5310276 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -76,6 +76,7 @@
 
 char *progname;
 int verbose = 1;
+int version;
 static int print_only = 0;
 
 #ifdef HAVE_LDISKFS_OSD
@@ -103,7 +104,6 @@ static int print_only = 0;
 
 void usage(FILE *out)
 {
-	fprintf(out, "%s v"LUSTRE_VERSION_STRING"\n", progname);
 	fprintf(out, "usage: %s <target type> [--backfstype="FSLIST"] "
 		"--fsname=<filesystem name>\n"
 		"\t--index=<target index> [options] <device>\n", progname);
@@ -162,6 +162,8 @@ void usage(FILE *out)
 		"\t\t--comment=<user comment>: arbitrary string (%d bytes)\n"
 		"\t\t--dryrun: report what we would do; don't write to disk\n"
 		"\t\t--verbose: e.g. show mkfs progress\n"
+		"\t\t-V|--version: output build version of the utility and\n"
+		"\t\t\texit\n"
 		"\t\t--quiet\n",
 		(int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata));
 	return;
@@ -304,10 +306,11 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
 		{ "servicenode",	required_argument,	NULL, 's' },
 		{ "network",		required_argument,	NULL, 't' },
 		{ "verbose",		no_argument,		NULL, 'v' },
+		{ "version",		no_argument,		NULL, 'V' },
 		{ "writeconf",		no_argument,		NULL, 'w' },
 		{ 0,			0,			NULL,  0  }
 	};
-	char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:PqrRs:t:Uu:vw";
+	char *optstring = "b:c:C:d:ef:Ghi:k:L:m:MnNo:Op:PqrRs:t:Uu:vVw";
 	int opt;
 	int rc, longidx;
 	int failnode_set = 0, servicenode_set = 0;
@@ -498,12 +501,17 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
                         strscpy(mop->mo_ldd.ldd_userdata, optarg,
                                 sizeof(mop->mo_ldd.ldd_userdata));
                         break;
-                case 'v':
-                        verbose++;
-                        break;
-                case 'w':
-                        mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF;
-                        break;
+		case 'v':
+			verbose++;
+			break;
+		case 'V':
+			++version;
+			fprintf(stdout, "%s %s\n", progname,
+				LUSTRE_VERSION_STRING);
+			return 0;
+		case 'w':
+			mop->mo_ldd.ldd_flags |= LDD_F_WRITECONF;
+			break;
 		case 'Q':
 			mop->mo_flags |= MO_QUOTA;
 			break;
@@ -603,16 +611,16 @@ int main(int argc, char *const argv[])
 		mop.mo_ldd.ldd_flags |= LDD_F_WRITECONF;
 	}
 
-        if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE))
-            mop.mo_mgs_failnodes++;
+	if (strstr(mop.mo_ldd.ldd_params, PARAM_MGSNODE))
+		mop.mo_mgs_failnodes++;
 
-        if (verbose > 0)
-                print_ldd("Read previous values", &(mop.mo_ldd));
+	if (verbose > 0)
+		print_ldd("Read previous values", &(mop.mo_ldd));
 #endif
 
-        ret = parse_opts(argc, argv, &mop, &mountopts);
-        if (ret)
-                goto out;
+	ret = parse_opts(argc, argv, &mop, &mountopts);
+	if (ret || version)
+		goto out;
 
         ldd = &mop.mo_ldd;