From 53a1425650fac5b6d1ab4b219754ee0822785f39 Mon Sep 17 00:00:00 2001 From: adilger Date: Sat, 2 Oct 2004 00:59:16 +0000 Subject: [PATCH] Merge b1_4_smallfix from b1_4 (20041001_1227) - notify osc create thread that OSC is being cleaned up (4600) - add nettype argument for llmount in #5d in conf-sanity.sh (3936) - reconstruct ost_handle() like mds_handle() (4657) - let lconf resolve symlinked-to devices (4629) - don't unlink "objects" from directory with default EA (4554) - allocate qswnal tx descriptors singly to avoid fragmentation (4504) - allow more than 32000 subdirectories in a single directory (3244) - OST returns ENOSPC from object create when no space left (4539) - limit OSC precreate to 1/2 of value OST considers bogus (4778) - bind to privileged port in socknal and tcpnal (3689) --- lustre/tests/unlinkmany.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lustre/tests/unlinkmany.c b/lustre/tests/unlinkmany.c index ba1bee7..080b1c6 100644 --- a/lustre/tests/unlinkmany.c +++ b/lustre/tests/unlinkmany.c @@ -16,17 +16,23 @@ void usage(char *prog) int main(int argc, char ** argv) { - int i, rc = 0; + int i, rc = 0, do_rmdir = 0; char format[4096], *fmt; char filename[4096]; long start, last; long begin = 0, count; - if (argc < 3 || argc > 4) { + if (argc < 3 || argc > 5) { usage(argv[0]); return 1; } + if (strcmp(argv[1], "-d") == 0) { + do_rmdir = 1; + argv++; + argc--; + } + if (strlen(argv[1]) > 4080) { printf("name too long\n"); return 1; @@ -53,9 +59,13 @@ int main(int argc, char ** argv) } for (i = 0; i < count; i++, begin++) { sprintf(filename, fmt, begin); - rc = unlink(filename); + if (do_rmdir) + rc = rmdir(filename); + else + rc = unlink(filename); if (rc) { - printf("unlink(%s) error: %s\n", + printf("%s(%s) error: %s\n", + do_rmdir ? "rmdir" : "unlink", filename, strerror(errno)); rc = errno; break; -- 1.8.3.1