X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=btrfs-select-super.c;h=e021221e286d20218c84a9c7e7605c55e4526a0b;hb=f9c56d3489c60f0bedf5b86ead01bf471e9411d6;hp=bd44978ac538d3e054d8671efd4077499fb7605c;hpb=e72cb5de1211cedc0af2fd9ea4d7535d35c34f76;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/btrfs-select-super.c b/btrfs-select-super.c
index bd44978..e021221 100644
--- a/btrfs-select-super.c
+++ b/btrfs-select-super.c
@@ -29,15 +29,16 @@
 #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);
 }
 
-int main(int ac, char **av)
+int main(int argc, char **argv)
 {
 	struct btrfs_root *root;
 	int ret;
@@ -46,7 +47,7 @@ int main(int ac, char **av)
 
 	while(1) {
 		int c;
-		c = getopt(ac, av, "s:");
+		c = getopt(argc, argv, "s:");
 		if (c < 0)
 			break;
 		switch(c) {
@@ -64,10 +65,8 @@ int main(int ac, char **av)
 				print_usage();
 		}
 	}
-	set_argv0(av);
-	ac = ac - optind;
-
-	if (check_argc_exact(ac, 1))
+	set_argv0(argv);
+	if (check_argc_exact(argc - optind, 1))
 		print_usage();
 
 	if (bytenr == 0) {
@@ -77,15 +76,15 @@ int main(int ac, char **av)
 
 	radix_tree_init();
 
-	if((ret = check_mounted(av[optind])) < 0) {
-		fprintf(stderr, "Could not check mount status: %s\n", strerror(-ret));
+	if((ret = check_mounted(argv[optind])) < 0) {
+		error("cannot check mount status: %s", strerror(-ret));
 		return ret;
 	} else if(ret) {
-		fprintf(stderr, "%s is currently mounted. Aborting.\n", av[optind]);
+		error("%s is currently mounted, aborting", argv[optind]);
 		return -EBUSY;
 	}
 
-	root = open_ctree(av[optind], bytenr, 1);
+	root = open_ctree(argv[optind], bytenr, 1);
 
 	if (!root) {
 		fprintf(stderr, "Open ctree failed\n");
@@ -94,7 +93,7 @@ int main(int ac, char **av)
 
 	/* 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
@@ -102,6 +101,7 @@ int main(int ac, char **av)
 	 */
 	printf("using SB copy %llu, bytenr %llu\n", (unsigned long long)num,
 	       (unsigned long long)bytenr);
+	close_ctree(root);
 	btrfs_close_all_devices();
 	return ret;
 }