From cc697263da464f16fd11cb8550a2838bdac42fd1 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Mon, 23 Sep 2019 12:18:21 -0500 Subject: [PATCH] LU-12795 tests: Prefer FAILF in mpi tests Prefer FAILF() to the sprintf()/FAIL() pattern and remove the errmsg temporary buffer. Cleanup use of assignment in conditional statements. Signed-off-by: Shaun Tancheff Change-Id: Icb04b188209ad3717260aa1238de1d9788d76f79 Reviewed-on: https://review.whamcloud.com/36276 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lustre/tests/mpi/cascading_rw.c | 112 ++++-------- lustre/tests/mpi/parallel_grouplock.c | 314 +++++++++++++--------------------- 2 files changed, 159 insertions(+), 267 deletions(-) diff --git a/lustre/tests/mpi/cascading_rw.c b/lustre/tests/mpi/cascading_rw.c index 359b947..1de1a69 100644 --- a/lustre/tests/mpi/cascading_rw.c +++ b/lustre/tests/mpi/cascading_rw.c @@ -61,7 +61,6 @@ char *testdir = NULL; void rw_file(char *name, long stride, unsigned int seed) { char filename[MAX_FILENAME_LEN]; - char errmsg[MAX_FILENAME_LEN+32]; char *buf, *o_buf; struct lov_user_md lum = {0}; int fd, rc, i, bad = 0, root = 0; @@ -80,21 +79,15 @@ void rw_file(char *name, long stride, unsigned int seed) fd = open(filename, O_CREAT | O_RDWR | O_LOV_DELAY_CREATE, FILEMODE); - if (fd == -1) { - sprintf(errmsg, "open of file %s", filename); - FAIL(errmsg); - } + if (fd == -1) + FAILF("open of file %s", filename); rc = ioctl(fd, LL_IOC_LOV_SETSTRIPE, &lum); - if (rc == -1) { - sprintf(errmsg, "ioctl SETSTRIPE of file %s", filename); - FAIL(errmsg); - } + if (rc == -1) + FAILF("ioctl SETSTRIPE of file %s", filename); - if (close(fd) == -1) { - sprintf(errmsg, "close of file %s", filename); - FAIL(errmsg); - } + if (close(fd) == -1) + FAILF("close of file %s", filename); } MPI_Barrier(MPI_COMM_WORLD); @@ -119,69 +112,51 @@ void rw_file(char *name, long stride, unsigned int seed) MPI_Barrier(MPI_COMM_WORLD); buf = (char *)malloc(stride); - if (buf == NULL) { - sprintf(errmsg, "malloc of buf with size %ld", stride); - FAIL(errmsg); - } + if (!buf) + FAILF("malloc of buf with size %ld", stride); if (rank == 0) { fd = open(filename, O_RDWR); - if (fd == -1) { - sprintf(errmsg, "open of file %s", filename); - FAIL(errmsg); - } + if (fd == -1) + FAILF("open of file %s", filename); off = 0; fill_stride(buf, stride, 0, off); rc = write(fd, buf, stride); - if (rc != stride) { - sprintf(errmsg, "write of file %s return %d", - filename, rc); - FAIL(errmsg); - } - off += stride; + if (rc != stride) + FAILF("write of file %s return %d", filename, rc); + off += stride; while (off < size * stride) { fill_stride(buf, stride, 0x8080808080808080ULL, off); rc = write(fd, buf, stride); - if (rc != stride) { - sprintf(errmsg, "write of file %s return %d", - filename, rc); - FAIL(errmsg); - } - + if (rc != stride) + FAILF("write of file %s return %d", + filename, rc); off += stride; } - if (close(fd) == -1) { - sprintf(errmsg, "close of file %s", filename); - FAIL(errmsg); - } + if (close(fd) == -1) + FAILF("close of file %s", filename); } MPI_Barrier(MPI_COMM_WORLD); o_buf = (char *)malloc(stride); - if (o_buf == NULL) { - sprintf(errmsg, "malloc of o_buf with size %ld", stride); - FAIL(errmsg); - } + if (!o_buf) + FAILF("malloc of o_buf with size %ld", stride); fd = open(filename, O_RDWR); - if (fd == -1) { - sprintf(errmsg, "open of file %s", filename); - FAIL(errmsg); - } + if (fd == -1) + FAILF("open of file %s", filename); off = 0; for (i = 1; i < size; ++i) { if (rank == i) { rc = lseek(fd, off, SEEK_SET); - if (rc != off) { - sprintf(errmsg, "lseek of file %s return %d", - filename, rc); - FAIL(errmsg); - } + if (rc != off) + FAILF("lseek of file %s return %d", + filename, rc); rc = read(fd, buf, stride); if (rc != stride) { @@ -189,18 +164,16 @@ void rw_file(char *name, long stride, unsigned int seed) fill_stride(o_buf, rc, i - 1, off); dump_diff(o_buf, buf, rc, off); } - sprintf(errmsg, "read of file %s return %d", - filename, rc); - FAIL(errmsg); + FAILF("read of file %s return %d", + filename, rc); } fill_stride(o_buf, stride, i - 1, off); if (memcmp(o_buf, buf, stride) != 0) { dump_diff(o_buf, buf, stride, off); errno = 0; - sprintf(errmsg, "Error: diff data read from %s", - filename); - FAIL(errmsg); + FAILF("Error: diff data read from %s", + filename); } } @@ -209,29 +182,23 @@ void rw_file(char *name, long stride, unsigned int seed) if (rank == i) { fill_stride(buf, stride, i, off); rc = write(fd, buf, stride); - if (rc != stride) { - sprintf(errmsg, "write of file %s return %d", - filename, rc); - FAIL(errmsg); - } + if (rc != stride) + FAILF("write of file %s return %d", + filename, rc); } MPI_Barrier(MPI_COMM_WORLD); } - if (close(fd) == -1) { - sprintf(errmsg, "close of file %s", filename); - FAIL(errmsg); - } + if (close(fd) == -1) + FAILF("close of file %s", filename); MPI_Barrier(MPI_COMM_WORLD); if (rank == 0) { fd = open(filename, O_RDONLY); - if (fd == -1) { - sprintf(errmsg, "open of file %s", filename); - FAIL(errmsg); - } + if (fd == -1) + FAILF("open of file %s", filename); off = 0; for (i = 0; i < size; ++i) { @@ -241,8 +208,7 @@ void rw_file(char *name, long stride, unsigned int seed) fill_stride(o_buf, rc, i, off); dump_diff(o_buf, buf, rc, off); } - sprintf(errmsg, "read of file %s", filename); - FAIL(errmsg); + FAILF("read of file %s", filename); } fill_stride(o_buf, stride, i, off); @@ -254,9 +220,7 @@ void rw_file(char *name, long stride, unsigned int seed) } if (bad == 1) { errno = 0; - sprintf(errmsg, "Error: diff data read from %s", - filename); - FAIL(errmsg); + FAILF("Error: diff data read from %s", filename); } } diff --git a/lustre/tests/mpi/parallel_grouplock.c b/lustre/tests/mpi/parallel_grouplock.c index 16480e7..dfddd4f 100644 --- a/lustre/tests/mpi/parallel_grouplock.c +++ b/lustre/tests/mpi/parallel_grouplock.c @@ -74,7 +74,6 @@ char buf[LPGL_BUF_LEN]; char *lgbuf; int lgbuf_size; char filename[MAX_FILENAME_LEN]; -char errmsg[MAX_FILENAME_LEN + 96]; static void alloc_lgbuf() @@ -98,16 +97,12 @@ read_buf(int fd) rc = read(fd, buf, sizeof(buf)); if (rc == -1) { pos = lseek(fd, 0, SEEK_CUR); - sprintf(errmsg, - "read of file %s at pos %d for %zu bytes returned %d: (%d) %s.\n", - filename, pos, sizeof(buf), rc, errno, strerror(errno)); - FAIL(errmsg); + FAILF("read of file %s at pos %d for %zu bytes returned %d: (%d) %s.\n", + filename, pos, sizeof(buf), rc, errno, strerror(errno)); } else if (rc != sizeof(buf)) { pos = lseek(fd, 0, SEEK_CUR); - sprintf(errmsg, - "read of file %s at pos %d for %zu bytes returned %d.\n", - filename, pos, sizeof(buf), rc); - FAIL(errmsg); + FAILF("read of file %s at pos %d for %zu bytes returned %d.\n", + filename, pos, sizeof(buf), rc); } } @@ -120,17 +115,12 @@ write_buf(int fd, int index) memset(buf, index, sizeof(buf)); lseek(fd, pos, SEEK_SET); rc = write(fd, buf, sizeof(buf)); - if (rc == -1) { - sprintf(errmsg, - "write of file %s at pos %d for %zu bytes returned %d: (%d) %s.\n", - filename, pos, sizeof(buf), rc, errno, strerror(errno)); - FAIL(errmsg); - } else if (rc != sizeof(buf)) { - sprintf(errmsg, - "write of file %s at pos %d for %zu bytes returned %d.\n", - filename, pos, sizeof(buf), rc); - FAIL(errmsg); - } + if (rc == -1) + FAILF("write of file %s at pos %d for %zu bytes returned %d: (%d) %s.\n", + filename, pos, sizeof(buf), rc, errno, strerror(errno)); + else if (rc != sizeof(buf)) + FAILF("write of file %s at pos %d for %zu bytes returned %d.\n", + filename, pos, sizeof(buf), rc); } /* @@ -149,12 +139,10 @@ void grouplock_test1(char *filename, int fd, int blocking_op, int unlock_op) int i, rc, gid = 1; if (rank == 0) { - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); } MPI_Barrier(MPI_COMM_WORLD); @@ -175,12 +163,10 @@ void grouplock_test1(char *filename, int fd, int blocking_op, int unlock_op) /* Wait for task1 to progress. This could be racey. */ sleep(WAIT_TIME); - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); write_buf(fd, rank); @@ -189,13 +175,11 @@ void grouplock_test1(char *filename, int fd, int blocking_op, int unlock_op) else rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); - if (rc == -1) { - sprintf(errmsg, - "%s release GROUP_LOCK of file %s: (%d) %s.\n", - (unlock_op == CLOSE) ? "close" : "ioctl", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + if (rc == -1) + FAILF("%s release GROUP_LOCK of file %s: (%d) %s.\n", + (unlock_op == CLOSE) ? "close" : "ioctl", + filename, errno, strerror(errno)); + MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD); break; case 0: @@ -233,12 +217,10 @@ void grouplock_test1(char *filename, int fd, int blocking_op, int unlock_op) write_buf(fd, rank); /* Now we need to release the lock */ - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_UNLOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_UNLOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); /* Wait for task1 to complete. */ iter = MAX_WAIT_TRIES; @@ -275,12 +257,10 @@ void grouplock_test2(char *filename, int fd, int blocking_op, int unlock_op) MPI_Request req1, req2, req3, req4; if (rank == 0) { - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); } MPI_Barrier(MPI_COMM_WORLD); @@ -291,12 +271,10 @@ void grouplock_test2(char *filename, int fd, int blocking_op, int unlock_op) sleep(2 * WAIT_TIME); case 1: gid = 2; - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); write_buf(fd, rank); @@ -313,13 +291,10 @@ void grouplock_test2(char *filename, int fd, int blocking_op, int unlock_op) rc = close(fd); else rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); - if (rc == -1) { - sprintf(errmsg, - "%s release GROUP_LOCK of file %s: (%d) %s.\n", - (unlock_op == CLOSE) ? "close" : "ioctl", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + if (rc == -1) + FAILF("%s release GROUP_LOCK of file %s: (%d) %s.\n", + (unlock_op == CLOSE) ? "close" : "ioctl", + filename, errno, strerror(errno)); break; case 2: /* Give task1 a chance to request its GR lock. */ @@ -339,23 +314,18 @@ void grouplock_test2(char *filename, int fd, int blocking_op, int unlock_op) /* Give task1 & 3 a chance to queue their GR locks. */ sleep(3 * WAIT_TIME); - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); write_buf(fd, rank); rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); - if (rc == -1) { - sprintf(errmsg, - "%s release GROUP_LOCK of file %s: (%d) %s.\n", - (unlock_op == CLOSE) ? "close" : "ioctl", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + if (rc == -1) + FAILF("%s release GROUP_LOCK of file %s: (%d) %s.\n", + (unlock_op == CLOSE) ? "close" : "ioctl", + filename, errno, strerror(errno)); MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD); break; @@ -401,12 +371,10 @@ void grouplock_test2(char *filename, int fd, int blocking_op, int unlock_op) write_buf(fd, rank); /* Now let's release first lock */ - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_UNLOCK of file %s returned %d", - filename, rc); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_UNLOCK of file %s returned %d", + filename, rc); /* Wait for task1 & 3 to signal they have their lock. */ iter = MAX_WAIT_TRIES; @@ -474,11 +442,9 @@ void grouplock_test3(char *filename, int fd) alloc_lgbuf(); } else if (rank == 2) { rc = fcntl(fd, F_SETFL, O_NONBLOCK); - if (rc == -1) { - sprintf(errmsg, "fcntl(O_NONBLOCK) failed: (%d) %s.\n", + if (rc == -1) + FAILF("fcntl(O_NONBLOCK) failed: (%d) %s.\n", errno, strerror(errno)); - FAIL(errmsg); - } } MPI_Barrier(MPI_COMM_WORLD); @@ -495,12 +461,10 @@ void grouplock_test3(char *filename, int fd) */ usleep(10000); - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); /* tell task0 we have the lock. */ MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD); @@ -509,18 +473,12 @@ void grouplock_test3(char *filename, int fd) break; case 0: rc = write(fd, lgbuf, lgbuf_size); - if (rc == -1) { - sprintf(errmsg, - "write of file %s for %d bytes returned %d: (%d) %s.\n", - filename, lgbuf_size, - rc, errno, strerror(errno)); - FAIL(errmsg); - } else if (rc != lgbuf_size) { - sprintf(errmsg, - "write of file %s for %d bytes returned %d.\n", - filename, lgbuf_size, rc); - FAIL(errmsg); - } + if (rc == -1) + FAILF("write of file %s for %d bytes returned %d: (%d) %s.\n", + filename, lgbuf_size, rc, errno, strerror(errno)); + else if (rc != lgbuf_size) + FAILF("write of file %s for %d bytes returned %d.\n", + filename, lgbuf_size, rc); /* GR tasks will tell us when they complete */ MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1); @@ -589,12 +547,10 @@ void grouplock_test4(char *filename, int fd) MPI_STATUS_IGNORE); sleep(2 * WAIT_TIME); - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); /* tell task0 we have the lock. */ MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD); @@ -607,29 +563,21 @@ void grouplock_test4(char *filename, int fd) MPI_STATUS_IGNORE); rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); - if (rc == -1) { - sprintf(errmsg, - "ioctl GROUP_UNLOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + if (rc == -1) + FAILF("ioctl GROUP_UNLOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); break; case 0: /* tell task1 to go to avoid race */ MPI_Send(&gid, 1, MPI_INT, 1, 1, MPI_COMM_WORLD); rc = write(fd, lgbuf, lgbuf_size); - if (rc == -1) { - sprintf(errmsg, - "write of file %s for %d bytes returned %d: (%d) %s.\n", - filename, lgbuf_size, - rc, errno, strerror(errno)); - FAIL(errmsg); - } else if (rc != lgbuf_size) { - sprintf(errmsg, - "write of file %s for %d bytes returned %d.\n", - filename, lgbuf_size, rc); - FAIL(errmsg); - } + if (rc == -1) + FAILF("write of file %s for %d bytes returned %d: (%d) %s.\n", + filename, lgbuf_size, + rc, errno, strerror(errno)); + else if (rc != lgbuf_size) + FAILF("write of file %s for %d bytes returned %d.\n", + filename, lgbuf_size, rc); /* wait for task2 to get its lock. */ MPI_Recv(&temp1, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, @@ -679,20 +627,16 @@ void grouplock_nonblock_test(char *filename, int fd) int rc, gid = 1; if (rank == 0) { - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); } rc = fcntl(fd, F_SETFL, O_NONBLOCK); - if (rc == -1) { - sprintf(errmsg, "fcntl(O_NONBLOCK) failed: (%d) %s.\n", - errno, strerror(errno)); - FAIL(errmsg); - } + if (rc == -1) + FAILF("fcntl(O_NONBLOCK) failed: (%d) %s.\n", + errno, strerror(errno)); MPI_Barrier(MPI_COMM_WORLD); @@ -739,11 +683,9 @@ void grouplock_nonblock_test(char *filename, int fd) MPI_Test(&req3, &flag3, MPI_STATUS_IGNORE); } while (!(flag1 && flag2 && flag3)); - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) { - sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s", - filename); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_UNLOCK of file %s", filename); break; } } @@ -757,66 +699,54 @@ void grouplock_errorstest(char *filename, int fd) switch (rank) { case 0: - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_LOCK of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_LOCK of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); /* second group lock on same fd, same gid */ - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) { - if (errno != EINVAL) { - sprintf(errmsg, - "Double GROUP lock failed with errno %d instead of EINVAL\n", - errno); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid); + if (rc == -1) { + if (errno != EINVAL) + FAILF("Double GROUP lock failed with errno %d instead of EINVAL\n", + errno); } else { FAIL("Taking second GROUP lock on same fd succeed\n"); } /* second group lock on same fd, different gid */ - if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid + 1)) == -1) { - if (errno != EINVAL) { - sprintf(errmsg, - "Double GROUP lock with different gid failed with errno %d instead of EINVAL\n", - errno); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid + 1); + if (rc == -1) { + if (errno != EINVAL) + FAILF("Double GROUP lock with different gid failed with errno %d instead of EINVAL\n", + errno); } else { FAIL("Taking second GROUP lock on same fd, with different gid, succeeded.\n"); } /* GROUP unlock with wrong gid */ - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid + 1)) == -1) { - if (errno != EINVAL) { - sprintf(errmsg, - "GROUP_UNLOCK with wrong gid failed with errno %d instead of EINVAL\n", - errno); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid + 1); + if (rc == -1) { + if (errno != EINVAL) + FAILF("GROUP_UNLOCK with wrong gid failed with errno %d instead of EINVAL\n", + errno); } else { FAIL("GROUP unlock with wrong gid succeed\n"); } - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) { - sprintf(errmsg, - "ioctl GROUP_UNLOCK of file %s returned %d.", - filename, rc); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); + if (rc == -1) + FAILF("ioctl GROUP_UNLOCK of file %s returned %d.", + filename, rc); break; case 1: /* unlock of never locked fd */ - if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) { - if (errno != EINVAL) { - sprintf(errmsg, - "GROUP_UNLOCK on never locked fd failed with errno %d instead of EINVAL.\n", - errno); - FAIL(errmsg); - } + rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid); + if (rc == -1) { + if (errno != EINVAL) + FAILF("GROUP_UNLOCK on never locked fd failed with errno %d instead of EINVAL.\n", + errno); } else { FAIL("GROUP unlock on never locked fd succeed\n"); } @@ -832,11 +762,10 @@ void grouplock_file(char *name, int subtest) sprintf(filename, "%s/%s", testdir, name); - if ((fd = open(filename, flags, mode)) == -1) { - sprintf(errmsg, "open of file %s: (%d) %s.\n", - filename, errno, strerror(errno)); - FAIL(errmsg); - } + fd = open(filename, flags, mode); + if (fd == -1) + FAILF("open of file %s: (%d) %s.\n", + filename, errno, strerror(errno)); MPI_Barrier(MPI_COMM_WORLD); @@ -878,9 +807,8 @@ void grouplock_file(char *name, int subtest) grouplock_test4(filename, fd); break; default: - sprintf(errmsg, "wrong subtest number %d (should be <= %d)", - subtest, LPGL_TEST_ITEMS); - FAIL(errmsg); + FAILF("wrong subtest number %d (should be <= %d)", + subtest, LPGL_TEST_ITEMS); } close(fd); -- 1.8.3.1