btrfs-progs: prop: also allow "none" to disable compression

[platform/upstream/btrfs-progs.git] / cmds-rescue.c

diff --git a/cmds-rescue.c b/cmds-rescue.c
index 0dbff2d..d1bec02 100644 (file)
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -24,6 +24,7 @@
 #include "disk-io.h"
 #include "commands.h"
 #include "utils.h"
+#include "help.h"
 
 static const char * const rescue_cmd_group_usage[] = {
        "btrfs rescue <command> [options] <path>",
@@ -43,15 +44,6 @@ static const char * const cmd_rescue_chunk_recover_usage[] = {
        NULL
 };
 
-static const char * const cmd_rescue_super_recover_usage[] = {
-       "btrfs rescue super-recover [options] <device>",
-       "Recover bad superblocks from good copies",
-       "",
-       "-y     Assume an answer of `yes' to all questions",
-       "-v     Verbose mode",
-       NULL
-};
-
 static int cmd_rescue_chunk_recover(int argc, char *argv[])
 {
        int ret = 0;
@@ -76,8 +68,7 @@ static int cmd_rescue_chunk_recover(int argc, char *argv[])
                }
        }
 
-       argc = argc - optind;
-       if (check_argc_exact(argc, 1))
+       if (check_argc_exact(argc - optind, 1))
                usage(cmd_rescue_chunk_recover_usage);
 
        file = argv[optind];
@@ -103,6 +94,15 @@ static int cmd_rescue_chunk_recover(int argc, char *argv[])
        return ret;
 }
 
+static const char * const cmd_rescue_super_recover_usage[] = {
+       "btrfs rescue super-recover [options] <device>",
+       "Recover bad superblocks from good copies",
+       "",
+       "-y     Assume an answer of `yes' to all questions",
+       "-v     Verbose mode",
+       NULL
+};
+
 /*
  * return codes:
  *   0 : All superblocks are valid, no need to recover
@@ -133,8 +133,7 @@ static int cmd_rescue_super_recover(int argc, char **argv)
                        usage(cmd_rescue_super_recover_usage);
                }
        }
-       argc = argc - optind;
-       if (check_argc_exact(argc, 1))
+       if (check_argc_exact(argc - optind, 1))
                usage(cmd_rescue_super_recover_usage);
 
        dname = argv[optind];
@@ -165,6 +164,8 @@ static int cmd_rescue_zero_log(int argc, char **argv)
        char *devname;
        int ret;
 
+       clean_args_no_options(argc, argv, cmd_rescue_zero_log_usage);
+
        if (check_argc_exact(argc, 2))
                usage(cmd_rescue_zero_log_usage);
 
@@ -190,6 +191,7 @@ static int cmd_rescue_zero_log(int argc, char **argv)
                        (unsigned long long)btrfs_super_log_root(sb),
                        (unsigned)btrfs_super_log_root_level(sb));
        trans = btrfs_start_transaction(root, 1);
+       BUG_ON(IS_ERR(trans));
        btrfs_set_super_log_root(sb, 0);
        btrfs_set_super_log_root_level(sb, 0);
        btrfs_commit_transaction(trans, root);