forked from Mirrors/btrfs-progs
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 <guihc.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>master
parent
ec3fbfcb55
commit
f1bb766b3b
|
@ -115,6 +115,7 @@ int main(int argc, char *argv[])
|
||||||
int skinny_flag = 0;
|
int skinny_flag = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
optind = 1;
|
||||||
while(1) {
|
while(1) {
|
||||||
int c = getopt(argc, argv, "S:rx");
|
int c = getopt(argc, argv, "S:rx");
|
||||||
if (c < 0)
|
if (c < 0)
|
||||||
|
@ -143,6 +144,13 @@ int main(int argc, char *argv[])
|
||||||
return 1;
|
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)) {
|
if (check_mounted(device)) {
|
||||||
fprintf(stderr, "%s is mounted\n", device);
|
fprintf(stderr, "%s is mounted\n", device);
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -176,6 +184,7 @@ int main(int argc, char *argv[])
|
||||||
} else {
|
} else {
|
||||||
root->fs_info->readonly = 1;
|
root->fs_info->readonly = 1;
|
||||||
ret = 1;
|
ret = 1;
|
||||||
|
fprintf(stderr, "btrfstune failed\n");
|
||||||
}
|
}
|
||||||
close_ctree(root);
|
close_ctree(root);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue