when we use multiple options, error return status will be override by the
last option status.
example: btrfstune -S 1 -r /dev/loop0
when -S option fails and -r option succeeds, return value is 0, rather than
1, where 1 is the right return status.
Reported-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx>
Signed-off-by: Fan Chengniang <fancn.fnst@xxxxxxxxxxxxxx>
---
btrfstune.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/btrfstune.c b/btrfstune.c
index 9a9e855..499a71d 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -117,6 +117,7 @@ int main(int argc, char *argv[])
{
struct btrfs_root *root;
int success = 0;
+ int total = 0;
int extrefs_flag = 0;
int seeding_flag = 0;
u64 seeding_value = 0;
@@ -199,19 +200,22 @@ int main(int argc, char *argv[])
ignore_enabled_seeding);
if (!ret)
success++;
+ total++;
}
if (extrefs_flag) {
enable_extrefs_flag(root);
success++;
+ total++;
}
if (skinny_flag) {
enable_skinny_metadata(root);
success++;
+ total++;
}
- if (success > 0) {
+ if (success == total) {
ret = 0;
} else {
root->fs_info->readonly = 1;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
