diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2022-04-21 15:18:31 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2022-04-22 12:42:52 -0700 |
| commit | 28de4d1334d4519c1a64659245dfd84cc2ddfa6c (patch) | |
| tree | 2534652d6cff54536ee97fdc69a0ac134941c6f3 | |
| parent | fdff1ab3157c2787d908e013b9d42db84184e196 (diff) | |
| download | f2fs-tools-28de4d1334d4519c1a64659245dfd84cc2ddfa6c.tar.gz | |
tools/f2fs_io: Fix the type of 'ret'
Make it possible to check whether the return value of ioctl() is negative.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | tools/f2fs_io/f2fs_io.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c index e807177..6bb094c 100644 --- a/tools/f2fs_io/f2fs_io.c +++ b/tools/f2fs_io/f2fs_io.c @@ -513,7 +513,7 @@ static void do_erase(int argc, char **argv, const struct cmd_desc *cmd) static void do_write(int argc, char **argv, const struct cmd_desc *cmd) { - u64 buf_size = 0, inc_num = 0, ret = 0, written = 0; + u64 buf_size = 0, inc_num = 0, written = 0; u64 offset; char *buf = NULL; unsigned bs, count, i; @@ -561,6 +561,8 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd) fd = xopen(argv[6], O_CREAT | O_WRONLY | flags, 0755); if (atomic_commit || atomic_abort) { + int ret; + if (argc == 8) useconds = atoi(argv[7]) * 1000; @@ -573,6 +575,8 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd) total_time = get_current_us(); for (i = 0; i < count; i++) { + uint64_t ret; + if (!strcmp(argv[4], "inc_num")) *(int *)buf = inc_num++; else if (!strcmp(argv[4], "rand")) @@ -593,12 +597,16 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd) usleep(useconds); if (atomic_commit) { + int ret; + ret = ioctl(fd, F2FS_IOC_COMMIT_ATOMIC_WRITE); if (ret < 0) { fputs("committing atomic write failed\n", stderr); exit(1); } } else if (atomic_abort) { + int ret; + ret = ioctl(fd, F2FS_IOC_ABORT_VOLATILE_WRITE); if (ret < 0) { fputs("aborting atomic write failed\n", stderr); |