diff options
| author | Bernhard Reutner-Fischer | 2013-11-09 23:13:17 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2013-11-09 23:41:34 +0100 |
| commit | 140f4e351191d8633fd5bd6dcf38cdcccc1f07cb (patch) | |
| tree | 9d2c6f727db5e51b6ce367b9f124b6108c02df88 | |
| parent | 1d39e33d46f32862da2ec1c394401239515206b8 (diff) | |
| download | busybox-140f4e351191d8633fd5bd6dcf38cdcccc1f07cb.zip busybox-140f4e351191d8633fd5bd6dcf38cdcccc1f07cb.tar.gz | |
fstrim: -17b
Also, use the name of the block device we found, not necessarily the one
we got from the user:
fstrim -v /
/dev/sdj: 4711 bytes were trimmed
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | util-linux/fstrim.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c index 2fa457b..00140b3 100644 --- a/util-linux/fstrim.c +++ b/util-linux/fstrim.c @@ -60,9 +60,7 @@ int fstrim_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int fstrim_main(int argc UNUSED_PARAM, char **argv) { struct fstrim_range range; - char *arg_o; - char *arg_l; - char *arg_m; + char *arg_o, *arg_l, *arg_m, *bd; unsigned opts; int fd; @@ -96,16 +94,15 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv) if (opts & OPT_m) range.minlen = xatoull_sfx(arg_m, fstrim_sfx); - if (find_block_device(argv[optind])) { - fd = xopen_nonblocking(argv[optind]); + bd = find_block_device(*(argv += optind)); + if (bd) { + fd = xopen_nonblocking(bd); xioctl(fd, FITRIM, &range); if (ENABLE_FEATURE_CLEAN_UP) close(fd); if (opts & OPT_v) - printf("%s: %llu bytes were trimmed\n", argv[optind], range.len); + printf("%s: %llu bytes were trimmed\n", bd, range.len); } - return EXIT_SUCCESS; } - |