From f1bb766b3b387ce67ab377ad87af7c5d93b12803 Mon Sep 17 00:00:00 2001 From: Gui Hecheng Date: Wed, 18 Dec 2013 11:52:45 +0800 Subject: [PATCH] btrfs-progs: fix btrfstune silence on failure Originally, btrfstune will fail without any options, like this: # btrfstune /dev/sdb An error prompt & usage should show up upon this condition. Signed-off-by: Gui Hecheng Signed-off-by: David Sterba Signed-off-by: Chris Mason --- btrfstune.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/btrfstune.c b/btrfstune.c index 50724ba..da82f36 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -115,6 +115,7 @@ int main(int argc, char *argv[]) int skinny_flag = 0; int ret; + optind = 1; while(1) { int c = getopt(argc, argv, "S:rx"); if (c < 0) @@ -143,6 +144,13 @@ int main(int argc, char *argv[]) return 1; } + if (!(seeding_flag + extrefs_flag + skinny_flag)) { + fprintf(stderr, + "ERROR: At least one option should be assigned.\n"); + print_usage(); + return 1; + } + if (check_mounted(device)) { fprintf(stderr, "%s is mounted\n", device); return 1; @@ -176,6 +184,7 @@ int main(int argc, char *argv[]) } else { root->fs_info->readonly = 1; ret = 1; + fprintf(stderr, "btrfstune failed\n"); } close_ctree(root); -- 2.7.4