emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fstrim: use new-style config/kbuild/applet snippets; trim help text

Browse Source 
function                                             old     new   delta
packed_usage                                       29546   29520     -26

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-11-12 12:09:14 +01:00
parent d3092c99ae
commit cd0936be36
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/applets.src.h
View File

@ -167,7 +167,6 @@ IF_FSCK(APPLET(fsck, BB_DIR_SBIN, BB_SUID_DROP))
//IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext2))
//IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3))
IF_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, BB_DIR_SBIN, BB_SUID_DROP, fsck_minix))
IF_FSTRIM(APPLET(fstrim, BB_DIR_SBIN, BB_SUID_DROP))
IF_FSYNC(APPLET_NOFORK(fsync, fsync, BB_DIR_BIN, BB_SUID_DROP, fsync))
IF_FTPD(APPLET(ftpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))

7
util-linux/Config.src
View File

@ -246,13 +246,6 @@ config FSCK_MINIX
check for and attempt to repair any corruption that occurs to a minix
filesystem.
config FSTRIM
bool "fstrim"
default y
select PLATFORM_LINUX
help
Discard unused blocks on a mounted filesystem.
config MKFS_EXT2
bool "mkfs_ext2"
default y

1
util-linux/Kbuild.src
View File

@ -18,7 +18,6 @@ lib-$(CONFIG_FINDFS) += findfs.o
lib-$(CONFIG_FLOCK) += flock.o
lib-$(CONFIG_FREERAMDISK) += freeramdisk.o
lib-$(CONFIG_FSCK_MINIX) += fsck_minix.o
lib-$(CONFIG_FSTRIM) += fstrim.o
lib-$(CONFIG_GETOPT) += getopt.o
lib-$(CONFIG_HEXDUMP) += hexdump.o
lib-$(CONFIG_HWCLOCK) += hwclock.o

34
util-linux/fstrim.c
View File

@ -8,21 +8,31 @@
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
//config:config FSTRIM
//config: bool "fstrim"
//config: default y
//config: select PLATFORM_LINUX
//config: help
//config: Discard unused blocks on a mounted filesystem.
//applet:IF_FSTRIM(APPLET(fstrim, BB_DIR_SBIN, BB_SUID_DROP))
//kbuild:lib-$(CONFIG_FSTRIM) += fstrim.o
//usage:#define fstrim_trivial_usage
//usage: "[Options] <mountpoint>"
//usage: "[OPTIONS] MOUNTPOINT"
//usage:#define fstrim_full_usage "\n\n"
//usage: "Options:"
//usage: IF_LONG_OPTS(
//usage: "\n -o,--offset=offset offset in bytes to discard from"
//usage: "\n -l,--length=length length of bytes to discard from the offset"
//usage: "\n -m,--minimum=minimum minimum extent length to discard"
//usage: "\n -v,--verbose print number of discarded bytes"
//usage: " -o,--offset=OFFSET Offset in bytes to discard from"
//usage: "\n -l,--length=LEN Bytes to discard"
//usage: "\n -m,--minimum=MIN Minimum extent length"
//usage: "\n -v,--verbose Print number of discarded bytes"
//usage: )
//usage: IF_NOT_LONG_OPTS(
//usage: "\n -o offset offset in bytes to discard from"
//usage: "\n -l length length of bytes to discard from the offset"
//usage: "\n -m minimum minimum extent length to discard"
//usage: "\n -v, print number of discarded bytes"
//usage: " -o OFFSET Offset in bytes to discard from"
//usage: "\n -l LEN Bytes to discard"
//usage: "\n -m MIN Minimum extent length"
//usage: "\n -v, Print number of discarded bytes"
//usage: )
#include "libbb.h"
@ -94,7 +104,7 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
if (opts & OPT_m)
range.minlen = xatoull_sfx(arg_m, fstrim_sfx);
mp = *(argv += optind);
mp = argv[optind];
if (find_block_device(mp)) {
fd = xopen_nonblocking(mp);
xioctl(fd, FITRIM, &range);
@ -102,7 +112,7 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv)
close(fd);
if (opts & OPT_v)
printf("%s: %llu bytes were trimmed\n", mp, range.len);
printf("%s: %llu bytes trimmed\n", mp, (unsigned long long)range.len);
return EXIT_SUCCESS;
}
return EXIT_FAILURE;