X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=btrfs-select-super.c;h=e021221e286d20218c84a9c7e7605c55e4526a0b;hb=31ceca8ddd0039550821227a7990f13622c725a7;hp=48f37266b1678c91752757b665b279cc1cc86ef9;hpb=6398ed78f9d52769954ba5fe3c15452c390397a7;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/btrfs-select-super.c b/btrfs-select-super.c
index 48f3726..e021221 100644
--- a/btrfs-select-super.c
+++ b/btrfs-select-super.c
@@ -29,11 +29,12 @@
 #include "transaction.h"
 #include "list.h"
 #include "utils.h"
+#include "help.h"
 
 static void print_usage(void)
 {
-	fprintf(stderr, "usage: btrfs-select-super -s number dev\n");
-	fprintf(stderr, "%s\n", PACKAGE_STRING);
+	printf("usage: btrfs-select-super -s number dev\n");
+	printf("\t-s super   copy of superbloc to overwrite the primary one (values: 1, 2)\n");
 	exit(1);
 }
 
@@ -65,9 +66,7 @@ int main(int argc, char **argv)
 		}
 	}
 	set_argv0(argv);
-	argc = argc - optind;
-
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		print_usage();
 
 	if (bytenr == 0) {
@@ -78,10 +77,10 @@ int main(int argc, char **argv)
 	radix_tree_init();
 
 	if((ret = check_mounted(argv[optind])) < 0) {
-		fprintf(stderr, "Could not check mount status: %s\n", strerror(-ret));
+		error("cannot check mount status: %s", strerror(-ret));
 		return ret;
 	} else if(ret) {
-		fprintf(stderr, "%s is currently mounted. Aborting.\n", argv[optind]);
+		error("%s is currently mounted, aborting", argv[optind]);
 		return -EBUSY;
 	}
 
@@ -94,7 +93,7 @@ int main(int argc, char **argv)
 
 	/* make the super writing code think we've read the first super */
 	root->fs_info->super_bytenr = BTRFS_SUPER_INFO_OFFSET;
-	ret = write_all_supers(root);
+	ret = write_all_supers(root->fs_info);
 
 	/* we don't close the ctree or anything, because we don't want a real
 	 * transaction commit.  We just want the super copy we pulled off the