X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmds-rescue.c;h=c40088ad374e2e69447a93b05fd0379a083833b8;hb=14bf2b546d1cdc4ea20304d2fb7d67d75f8a2c55;hp=bcec3447fe946fcab2fe81733b9ef880747d6fb7;hpb=8ede30c220544034d2732b84d3438aa25bac4c11;p=platform%2Fupstream%2Fbtrfs-progs.git diff --git a/cmds-rescue.c b/cmds-rescue.c index bcec344..c40088a 100644 --- a/cmds-rescue.c +++ b/cmds-rescue.c @@ -20,10 +20,12 @@ #include #include "ctree.h" +#include "volumes.h" #include "transaction.h" #include "disk-io.h" #include "commands.h" #include "utils.h" +#include "help.h" static const char * const rescue_cmd_group_usage[] = { "btrfs rescue [options] ", @@ -43,16 +45,7 @@ static const char * const cmd_rescue_chunk_recover_usage[] = { NULL }; -static const char * const cmd_rescue_super_recover_usage[] = { - "btrfs rescue super-recover [options] ", - "Recover bad superblocks from good copies", - "", - "-y Assume an answer of `yes' to all questions", - "-v Verbose mode", - NULL -}; - -int cmd_rescue_chunk_recover(int argc, char *argv[]) +static int cmd_rescue_chunk_recover(int argc, char *argv[]) { int ret = 0; char *file; @@ -76,34 +69,41 @@ 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]; ret = check_mounted(file); if (ret < 0) { - fprintf(stderr, "Could not check mount status: %s\n", - strerror(-ret)); + error("could not check mount status: %s", strerror(-ret)); return 1; } else if (ret) { - fprintf(stderr, "the device is busy\n"); + error("the device is busy"); return 1; } ret = btrfs_recover_chunk_tree(file, verbose, yes); if (!ret) { - fprintf(stdout, "Recover the chunk tree successfully.\n"); + fprintf(stdout, "Chunk tree recovered successfully\n"); } else if (ret > 0) { ret = 0; - fprintf(stdout, "Abort to rebuild the on-disk chunk tree.\n"); + fprintf(stdout, "Chunk tree recovery aborted\n"); } else { - fprintf(stdout, "Fail to recover the chunk tree.\n"); + fprintf(stdout, "Chunk tree recovery failed\n"); } return ret; } +static const char * const cmd_rescue_super_recover_usage[] = { + "btrfs rescue super-recover [options] ", + "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 @@ -112,7 +112,7 @@ int cmd_rescue_chunk_recover(int argc, char *argv[]) * 3 : Fail to Recover bad supeblocks * 4 : Abort to recover bad superblocks */ -int cmd_rescue_super_recover(int argc, char **argv) +static int cmd_rescue_super_recover(int argc, char **argv) { int ret; int verbose = 0; @@ -134,18 +134,16 @@ 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]; ret = check_mounted(dname); if (ret < 0) { - fprintf(stderr, "Could not check mount status: %s\n", - strerror(-ret)); + error("could not check mount status: %s", strerror(-ret)); return 1; } else if (ret) { - fprintf(stderr, "the device is busy\n"); + error("the device is busy"); return 1; } ret = btrfs_recover_superblocks(dname, verbose, yes); @@ -159,7 +157,7 @@ static const char * const cmd_rescue_zero_log_usage[] = { NULL }; -int cmd_rescue_zero_log(int argc, char **argv) +static int cmd_rescue_zero_log(int argc, char **argv) { struct btrfs_root *root; struct btrfs_trans_handle *trans; @@ -167,22 +165,25 @@ 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); devname = argv[optind]; ret = check_mounted(devname); if (ret < 0) { - fprintf(stderr, "Could not check mount status: %s\n", strerror(-ret)); + error("could not check mount status: %s", strerror(-ret)); goto out; } else if (ret) { - fprintf(stderr, "%s is currently mounted. Aborting.\n", devname); + error("%s is currently mounted", devname); ret = -EBUSY; + goto out; } root = open_ctree(devname, 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL); if (!root) { - fprintf(stderr, "Could not open ctree\n"); + error("could not open ctree"); return 1; } @@ -192,6 +193,7 @@ 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); @@ -201,6 +203,51 @@ out: return !!ret; } +static const char * const cmd_rescue_fix_device_size_usage[] = { + "btrfs rescue fix-device-size ", + "Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size", + "", + NULL +}; + +static int cmd_rescue_fix_device_size(int argc, char **argv) +{ + struct btrfs_fs_info *fs_info; + char *devname; + int ret; + + clean_args_no_options(argc, argv, cmd_rescue_fix_device_size_usage); + + if (check_argc_exact(argc, 2)) + usage(cmd_rescue_fix_device_size_usage); + + devname = argv[optind]; + ret = check_mounted(devname); + if (ret < 0) { + error("could not check mount status: %s", strerror(-ret)); + goto out; + } else if (ret) { + error("%s is currently mounted", devname); + ret = -EBUSY; + goto out; + } + + fs_info = open_ctree_fs_info(devname, 0, 0, 0, OPEN_CTREE_WRITES | + OPEN_CTREE_PARTIAL); + if (!fs_info) { + error("could not open btrfs"); + ret = -EIO; + goto out; + } + + ret = btrfs_fix_device_and_super_size(fs_info); + if (ret > 0) + ret = 0; + close_ctree(fs_info->tree_root); +out: + return !!ret; +} + static const char rescue_cmd_group_info[] = "toolbox for specific rescue operations"; @@ -211,6 +258,8 @@ const struct cmd_group rescue_cmd_group = { { "super-recover", cmd_rescue_super_recover, cmd_rescue_super_recover_usage, NULL, 0}, { "zero-log", cmd_rescue_zero_log, cmd_rescue_zero_log_usage, NULL, 0}, + { "fix-device-size", cmd_rescue_fix_device_size, + cmd_rescue_fix_device_size_usage, NULL, 0}, NULL_CMD_STRUCT } };