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: tests: add test for send -p on 2 mont points
[platform/upstream/btrfs-progs.git]
/
btrfs-select-super.c
diff --git
a/btrfs-select-super.c
b/btrfs-select-super.c
index
6a458b8
..
e021221
100644
(file)
--- a/
btrfs-select-super.c
+++ b/
btrfs-select-super.c
@@
-16,8
+16,6
@@
* Boston, MA 021110-1307, USA.
*/
* Boston, MA 021110-1307, USA.
*/
-#define _XOPEN_SOURCE 500
-#define _GNU_SOURCE 1
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@
-25,44
+23,50
@@
#include <sys/stat.h>
#include "kerncompat.h"
#include "ctree.h"
#include <sys/stat.h>
#include "kerncompat.h"
#include "ctree.h"
+#include "volumes.h"
#include "disk-io.h"
#include "print-tree.h"
#include "transaction.h"
#include "list.h"
#include "disk-io.h"
#include "print-tree.h"
#include "transaction.h"
#include "list.h"
-#include "version.h"
#include "utils.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", BTRFS_BUILD_VERSION
);
+
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);
}
-int main(int a
c, char **a
v)
+int main(int a
rgc, char **arg
v)
{
struct btrfs_root *root;
int ret;
{
struct btrfs_root *root;
int ret;
-
int
num = 0;
+
u64
num = 0;
u64 bytenr = 0;
while(1) {
int c;
u64 bytenr = 0;
while(1) {
int c;
- c = getopt(a
c, a
v, "s:");
+ c = getopt(a
rgc, arg
v, "s:");
if (c < 0)
break;
switch(c) {
case 's':
if (c < 0)
break;
switch(c) {
case 's':
- num = atol(optarg);
- bytenr = btrfs_sb_offset(num);
+ num = arg_strtou64(optarg);
+ if (num >= BTRFS_SUPER_MIRROR_MAX) {
+ fprintf(stderr,
+ "ERROR: super mirror should be less than: %d\n",
+ BTRFS_SUPER_MIRROR_MAX);
+ exit(1);
+ }
+ bytenr = btrfs_sb_offset(((int)num));
break;
default:
print_usage();
}
}
break;
default:
print_usage();
}
}
- ac = ac - optind;
-
- if (ac != 1)
+ set_argv0(argv);
+ if (check_argc_exact(argc - optind, 1))
print_usage();
if (bytenr == 0) {
print_usage();
if (bytenr == 0) {
@@
-72,15
+76,15
@@
int main(int ac, char **av)
radix_tree_init();
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(a
rg
v[optind])) < 0) {
+
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", a
v[optind]);
+
error("%s is currently mounted, aborting", arg
v[optind]);
return -EBUSY;
}
return -EBUSY;
}
- root = open_ctree(av[optind], bytenr, 1);
+ root = open_ctree(a
rg
v[optind], bytenr, 1);
if (!root) {
fprintf(stderr, "Open ctree failed\n");
if (!root) {
fprintf(stderr, "Open ctree failed\n");
@@
-89,13
+93,15
@@
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;
/* 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
* disk to overwrite all the other copies
/* 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
* disk to overwrite all the other copies
- */
- printf("using SB copy %
d, bytenr %llu\n",
num,
+ */
+ printf("using SB copy %
llu, bytenr %llu\n", (unsigned long long)
num,
(unsigned long long)bytenr);
(unsigned long long)bytenr);
+ close_ctree(root);
+ btrfs_close_all_devices();
return ret;
}
return ret;
}