projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: mkfs: delete un-used parameter fd
[platform/upstream/btrfs-progs.git]
/
btrfs-select-super.c
diff --git
a/btrfs-select-super.c
b/btrfs-select-super.c
index
41997dd
..
e021221
100644
(file)
--- a/
btrfs-select-super.c
+++ b/
btrfs-select-super.c
@@
-29,11
+29,12
@@
#include "transaction.h"
#include "list.h"
#include "utils.h"
#include "transaction.h"
#include "list.h"
#include "utils.h"
+#include "help.h"
static void print_usage(void)
{
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);
}
exit(1);
}
@@
-76,10
+77,10
@@
int main(int argc, char **argv)
radix_tree_init();
if((ret = check_mounted(argv[optind])) < 0) {
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) {
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;
}
return -EBUSY;
}
@@
-92,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;
/* 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
/* 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