X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fllverfs.c;h=234508273275dadfdc4211ac26df2034d00a55ed;hb=5b468e20ecc0b77460444393d1bb41867d99899d;hp=7af885e530ff27c134e4f4d2b539e45c788ccc60;hpb=4db3aa0842f2be97aae017d351169e5237223156;p=fs%2Flustre-release.git

diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c
index 7af885e..23450827 100644
--- a/lustre/utils/llverfs.c
+++ b/lustre/utils/llverfs.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -124,22 +120,20 @@ const int dirmode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 static int isatty_flag;
 static int perms =  S_IRWXU | S_IRGRP | S_IROTH;
 
-static struct option const longopts[] =
-{
-	{ "chunksize", required_argument, 0, 'c' },
-	{ "help", no_argument, 0, 'h' },
-	{ "offset", required_argument, 0, 'o' },
-	{ "long", no_argument, 0, 'l' },
-	{ "full", no_argument, 0, 'l' },
-	{ "partial", required_argument, 0, 'p' },
-	{ "quiet", required_argument, 0, 'q' },
-	{ "read", no_argument, 0, 'r' },
-	{ "filesize", no_argument, 0, 's' },
-	{ "timestamp", required_argument, 0, 't' },
-	{ "verbose", no_argument, 0, 'v' },
-	{ "write", no_argument, 0, 'w' },
-	{ 0, 0, 0, 0}
-};
+static struct option const long_opts[] = {
+	{ .val = 'c',	.name = "chunksize",	.has_arg = required_argument },
+	{ .val = 'h',	.name = "help",		.has_arg = no_argument },
+	{ .val = 'l',	.name = "long",		.has_arg = no_argument },
+	{ .val = 'l',	.name = "full",		.has_arg = no_argument },
+	{ .val = 'o',	.name = "offset",	.has_arg = required_argument },
+	{ .val = 'p',	.name = "partial",	.has_arg = required_argument },
+	{ .val = 'q',	.name = "quiet",	.has_arg = required_argument },
+	{ .val = 'r',	.name = "read",		.has_arg = no_argument },
+	{ .val = 's',	.name = "filesize",	.has_arg = no_argument },
+	{ .val = 't',	.name = "timestamp",	.has_arg = required_argument },
+	{ .val = 'v',	.name = "verbose",	.has_arg = no_argument },
+	{ .val = 'w',	.name = "write",	.has_arg = no_argument },
+	{ .name = NULL } };
 
 /*
  * Usages: displays help information, whenever user supply --help option in
@@ -732,7 +726,7 @@ int main(int argc, char **argv)
 
 	progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/') + 1 : argv[0];
 	while ((c = getopt_long(argc, argv, "c:hlo:pqrs:t:vw",
-				      longopts, NULL)) != -1) {
+				      long_opts, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			chunksize = strtoul(optarg, NULL, 0) * ONE_MB;