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

blkdiscard: accept -f (force) as no-op

Browse Source 
function                                             old     new   delta
.rodata                                           104250  104251      +1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-09-10 00:20:05 +02:00
parent 0599e0f87b
commit c421388dca
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util-linux/blkdiscard.c
View File

@ -18,10 +18,12 @@
//usage:#define blkdiscard_trivial_usage //usage:#define blkdiscard_trivial_usage
//usage: "[-o OFS] [-l LEN] [-s] DEVICE" //usage: "[-o OFS] [-l LEN] [-s] DEVICE"
//usage:#define blkdiscard_full_usage "\n\n" //usage:#define blkdiscard_full_usage "\n\n"
//usage: "Discard sectors on DEVICE\n" //usage: "Discard sectors on DEVICE\n"
//usage: "\n -o OFS Byte offset into device" //usage: "\n -o OFS Byte offset into device"
//usage: "\n -l LEN Number of bytes to discard" //usage: "\n -l LEN Number of bytes to discard"
//usage: "\n -s Perform a secure discard" //usage: "\n -s Perform a secure discard"
///////: "\n -f Disable check for mounted filesystem"
//////////////// -f: accepted but is a nop (we do no check anyway)
//usage: //usage:
//usage:#define blkdiscard_example_usage //usage:#define blkdiscard_example_usage
//usage: "$ blkdiscard -o 0 -l 1G /dev/sdb" //usage: "$ blkdiscard -o 0 -l 1G /dev/sdb"
@ -51,9 +53,10 @@ int blkdiscard_main(int argc UNUSED_PARAM, char **argv)
OPT_OFFSET = (1 << 0), OPT_OFFSET = (1 << 0),
OPT_LENGTH = (1 << 1), OPT_LENGTH = (1 << 1),
OPT_SECURE = (1 << 2), OPT_SECURE = (1 << 2),
OPT_FORCE = (1 << 3), //nop
}; };
opts = getopt32(argv, "^" "o:l:s" "\0" "=1", &offset_str, &length_str); opts = getopt32(argv, "^" "o:l:sf" "\0" "=1", &offset_str, &length_str);
argv += optind; argv += optind;
fd = xopen(argv[0], O_RDWR|O_EXCL); fd = xopen(argv[0], O_RDWR|O_EXCL);