X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fstatmany.c;h=8a4f82aa375d29af546e00c3b296fa52cfa5ce40;hp=7d4d2c90f462bf4b8f82f98d716f3e67bb1f6448;hb=010425898fa4b2abc6325a8073e20cb994ce7947;hpb=2dc9c16e770415d56839e1996015fec5fab93f29

diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index 7d4d2c9..8a4f82a 100644
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -1,3 +1,35 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -9,31 +41,23 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <sys/ioctl.h>
 
-#if 0
-#include <linux/extN_fs.h>
-#endif
-#include <liblustre.h>
-#include <linux/lustre_lib.h>
-#include <linux/obd.h>
+#include <lustre/lustreapi.h>
 
 struct option longopts[] = {
-	{"ea", 0, 0, 'e'},
-	{"lookup", 0, 0, 'l'},
-	{"random", 0, 0, 'r'},
-	{"stat", 0, 0, 's'},
-	{NULL, 0, 0, 0},
+	{ .name = "lookup", .has_arg = no_argument, .val = 'l' },
+	{ .name = "random", .has_arg = no_argument, .val = 'r' },
+	{ .name = "stat", .has_arg = no_argument, .val = 's' },
+	{ .name = NULL }
 };
-char *shortopts = "ehlr:s0123456789";
+char *shortopts = "hlr:s0123456789";
 
 static int usage(char *prog, FILE *out)
 {
         fprintf(out,
-		"Usage: %s [-r rand_seed] {-s|-e|-l} filenamebase total_files iterations\n"
+		"Usage: %s [-r rand_seed] {-s|-l} filenamebase total_files iterations\n"
                "-r : random seed\n"
                "-s : regular stat() calls\n"
-               "-e : open then GET_EA ioctl\n"
                "-l : lookup ioctl only\n", prog);
         exit(out == stderr);
 }
@@ -45,15 +69,15 @@ static int usage(char *prog, FILE *out)
 int main(int argc, char ** argv)
 {
         long i, count, iter = LONG_MAX, mode = 0, offset;
-        long int start, length = LONG_MAX, last, rc = 0;
+        long int start, length = LONG_MAX, last;
         char parent[4096], *t;
-	char c, *prog = argv[0], *base;
-	int seed = 0;
+	char *prog = argv[0], *base;
+	int seed = 0, rc;
 	int fd = -1;
 
-	while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
+	while ((rc = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
 		char *e;
-		switch (c) {
+		switch (rc) {
 		case 'r':
 			seed = strtoul(optarg, &e, 0);
 			if (*e) {
@@ -61,10 +85,9 @@ int main(int argc, char ** argv)
 				usage(prog, stderr);
 			}
 			break;
-		case 'e':
 		case 'l':
 		case 's':
-			mode = c;
+			mode = rc;
 			break;
 		case '0':
 		case '1':
@@ -77,9 +100,9 @@ int main(int argc, char ** argv)
 		case '8':
 		case '9':
 			if (length == LONG_MAX)
-				length = c - '0';
+				length = rc - '0';
 			else
-				length = length * 10 + (c - '0');
+				length = length * 10 + (rc - '0');
 			break;
 		case 'h':
 			usage(prog, stdout);
@@ -145,24 +168,7 @@ int main(int argc, char ** argv)
                 tmp = random() % count;
                 sprintf(filename, "%s%d", base, tmp);
 
-                if (mode == 'e') {
-#if 0
-                        fd = open(filename, O_RDWR|O_LARGEFILE);
-                        if (fd < 0) {
-                                printf("open(%s) error: %s\n", filename,
-                                       strerror(errno));
-                                break;
-                        }
-                        rc = ioctl(fd, EXTN_IOC_GETEA, NULL);
-                        if (rc < 0) {
-                                printf("ioctl(%s) error: %s\n", filename,
-                                       strerror(errno));
-                                break;
-                        }
-                        close(fd);
-                        break;
-#endif
-		} else if (mode == 's') {
+		if (mode == 's') {
                         struct stat buf;
 
                         rc = stat(filename, &buf);
@@ -172,29 +178,15 @@ int main(int argc, char ** argv)
                                 break;
                         }
 		} else if (mode == 'l') {
-                        struct obd_ioctl_data data;
-                        char rawbuf[8192];
-                        char *buf = rawbuf;
-                        int max = sizeof(rawbuf);
-
-                        memset(&data, 0, sizeof(data));
-                        data.ioc_version = OBD_IOCTL_VERSION;
-                        data.ioc_len = sizeof(data);
-                        if (offset >= 0)
-                                data.ioc_inlbuf1 = filename + offset;
-                        else
-                                data.ioc_inlbuf1 = filename;
-                        data.ioc_inllen1 = strlen(data.ioc_inlbuf1) + 1;
-
-                        if (obd_ioctl_pack(&data, &buf, max)) {
-                                printf("ioctl_pack failed.\n");
-                                break;
-                        }
+			char *name = filename;
+
+			if (offset >= 0)
+				name += offset;
 
-                        rc = ioctl(fd, IOC_MDC_LOOKUP, buf);
+			rc = llapi_file_lookup(fd, name);
                         if (rc < 0) {
-                                printf("ioctl(%s) error: %s\n", filename,
-                                       strerror(errno));
+				printf("llapi_file_lookup for (%s) error: %s\n",
+				       filename, strerror(errno));
                                 break;
                         }
                 }