Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-10 08:30:41 +00:00
Code Issues Projects Releases Wiki Activity

fstrim: -17b

Browse Source 
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>
This commit is contained in:
Bernhard Reutner-Fischer 2013-11-09 23:13:17 +01:00
parent 1d39e33d46
commit 140f4e3511
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util-linux/fstrim.c
View File

@ -60,9 +60,7 @@ int fstrim_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int fstrim_main(int argc UNUSED_PARAM, char **argv) int fstrim_main(int argc UNUSED_PARAM, char **argv)
{ {
struct fstrim_range range; struct fstrim_range range;
char *arg_o; char *arg_o, *arg_l, *arg_m, *bd;
char *arg_l;
char *arg_m;
unsigned opts; unsigned opts;
int fd; int fd;
@ -96,16 +94,15 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
if (opts & OPT_m) if (opts & OPT_m)
range.minlen = xatoull_sfx(arg_m, fstrim_sfx); range.minlen = xatoull_sfx(arg_m, fstrim_sfx);
if (find_block_device(argv[optind])) { bd = find_block_device(*(argv += optind));
fd = xopen_nonblocking(argv[optind]); if (bd) {
fd = xopen_nonblocking(bd);
xioctl(fd, FITRIM, &range); xioctl(fd, FITRIM, &range);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
close(fd); close(fd);
if (opts & OPT_v) 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; return EXIT_SUCCESS;
} }