X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fstatmany.c;h=8a4f82aa375d29af546e00c3b296fa52cfa5ce40;hp=e33928ee58b7466d0896c690c9323a06ed289fcf;hb=734d944d98f4cbcaeebc462e979624e8bdfb7711;hpb=a44f229bcfd8636517460788753070f8af2b0ebf

diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index e33928e..8a4f82a 100644
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -15,17 +15,15 @@
  *
  * 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
  */
 /*
  * 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/
@@ -43,27 +41,23 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <sys/ioctl.h>
 
-#include <liblustre.h>
-#include <lustre_ioctl.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);
 }
@@ -91,7 +85,6 @@ int main(int argc, char ** argv)
 				usage(prog, stderr);
 			}
 			break;
-		case 'e':
 		case 'l':
 		case 's':
 			mode = rc;
@@ -175,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, LDISKFS_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);
@@ -202,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;
                         }
                 }