X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fobd.c;h=f6a93487b92a3814290b1da535136aa52e5c1fb0;hp=39bb35fbaf0a355237ddb58bd16cd158ffcbf2d6;hb=fc55dd29cfaccbe925839ff665591c85313e3359;hpb=7524da20e134f6bbafb2a10aadc89852c6cd236d

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 39bb35f..f6a9348 100644
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -3599,26 +3599,13 @@ int jt_nodemap_set_fileset(int argc, char **argv)
 	int   rc = 0;
 	int   c;
 
-	static struct option long_options[] = {
-		{
-			.name		= "name",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'n',
-		},
-		{
-			.name		= "fileset",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'f',
-		},
-		{
-			NULL
-		}
-	};
+	static struct option long_opts[] = {
+	{ .val = 'f',	.name = "fileset",	.has_arg = required_argument },
+	{ .val = 'n',	.name = "name",		.has_arg = required_argument },
+	{ .name = NULL } };
 
 	while ((c = getopt_long(argc, argv, "n:f:",
-				long_options, NULL)) != -1) {
+				long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'n':
 			nodemap_name = optarg;
@@ -3669,32 +3656,14 @@ int jt_nodemap_modify(int argc, char **argv)
 	char			*param = NULL;
 	char			*value = NULL;
 
-	static struct option long_options[] = {
-		{
-			.name		= "name",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'n',
-		},
-		{
-			.name		= "property",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'p',
-		},
-		{
-			.name		= "value",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'v',
-		},
-		{
-			NULL
-		}
-	};
+	static struct option long_opts[] = {
+	{ .val = 'n',	.name = "name",		.has_arg = required_argument },
+	{ .val = 'p',	.name = "property",	.has_arg = required_argument },
+	{ .val = 'v',	.name = "value",	.has_arg = required_argument },
+	{ .name = NULL } };
 
 	while ((c = getopt_long(argc, argv, "n:p:v:",
-				long_options, NULL)) != -1) {
+				long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'n':
 			nodemap_name = optarg;
@@ -3756,32 +3725,14 @@ int jt_nodemap_add_idmap(int argc, char **argv)
 	char			*idtype = NULL;
 	int			rc = 0;
 
-	static struct option long_options[] = {
-		{
-			.name		= "name",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'n',
-		},
-		{
-			.name		= "idmap",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'm',
-		},
-		{
-			.name		= "idtype",
-			.has_arg	= required_argument,
-			.flag		= 0,
-			.val		= 'i',
-		},
-		{
-			NULL
-		}
-	};
+	static struct option long_opts[] = {
+	{ .val = 'i',	.name = "idtype",	.has_arg = required_argument },
+	{ .val = 'm',	.name = "idmap",	.has_arg = required_argument },
+	{ .val = 'n',	.name = "name",		.has_arg = required_argument },
+	{ .name = NULL } };
 
 	while ((c = getopt_long(argc, argv, "n:m:i:",
-				long_options, NULL)) != -1) {
+				long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'n':
 			nodemap_name = optarg;