5e6377621
Bernhard Reutner-Fischer
2013-11-10
Subject
fstrim: Needs to fire at the mp, not bd
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/fstrim.c+5 -5
| @@ -60,7 +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, *arg_l, *arg_m, *bd; |
| + | char *arg_o, *arg_l, *arg_m, *mp; |
| unsigned opts; | |
| int fd; | |
| @@ -94,15 +94,15 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv) | |
| if (opts & OPT_m) | |
| range.minlen = xatoull_sfx(arg_m, fstrim_sfx); | |
| - | bd = find_block_device(*(argv += optind)); |
| - | if (bd) { |
| - | fd = xopen_nonblocking(bd); |
| + | mp = *(argv += optind); |
| + | if (find_block_device(mp)) { |
| + | fd = xopen_nonblocking(mp); |
| xioctl(fd, FITRIM, &range); | |
| if (ENABLE_FEATURE_CLEAN_UP) | |
| close(fd); | |
| if (opts & OPT_v) | |
| - | printf("%s: %llu bytes were trimmed\n", bd, range.len); |
| + | printf("%s: %llu bytes were trimmed\n", mp, range.len); |
| return EXIT_SUCCESS; | |
| } | |
| return EXIT_FAILURE; | |