X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fstatmany.c;h=8a4f82aa375d29af546e00c3b296fa52cfa5ce40;hb=76ca884398cae59e455caf3ae2ab1609c5fb1eea;hp=fc7efa9f86f49f34d065ba1b087caa8494a7b0e3;hpb=72057a3af19ee02d9a686bd7e7d074917e381310;p=fs%2Flustre-release.git diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c index fc7efa9..8a4f82a 100644 --- a/lustre/tests/statmany.c +++ b/lustre/tests/statmany.c @@ -41,15 +41,14 @@ #include #include #include -#include -#include +#include struct option longopts[] = { - {"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 = "hlr:s0123456789"; @@ -179,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; - rc = ioctl(fd, IOC_MDC_LOOKUP, buf); + if (offset >= 0) + name += offset; + + 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; } }