From 4735d0bb8248a3900f420cb9144e4f7969f0b44d Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 28 Oct 2013 14:28:43 -0400 Subject: Btrfs-progs: rework open_ctree to take flags, add a new one V2 So I needed to add a flag to not try to read block groups when doing --init-extent-tree since we could hang there, but that meant adding a whole other 0/1 type flag to open_ctree_fs_info. So instead I've converted it all over to using a flags setting and added the flag that I needed. This has been tested with xfstests and make test. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason --- quick-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'quick-test.c') diff --git a/quick-test.c b/quick-test.c index b12b9ef9..5dfb2feb 100644 --- a/quick-test.c +++ b/quick-test.c @@ -51,7 +51,7 @@ int main(int ac, char **av) { radix_tree_init(); - root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, O_RDWR); + root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, OPEN_CTREE_WRITES); if (!root) { fprintf(stderr, "Open ctree failed\n"); exit(1); @@ -78,7 +78,7 @@ int main(int ac, char **av) { btrfs_commit_transaction(trans, root); close_ctree(root); exit(1); - root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, O_RDWR); + root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, OPEN_CTREE_WRITES); if (!root) { fprintf(stderr, "Open ctree failed\n"); exit(1); @@ -101,7 +101,7 @@ int main(int ac, char **av) { } close_ctree(root); - root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, O_RDWR); + root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, OPEN_CTREE_WRITES); if (!root) { fprintf(stderr, "Open ctree failed\n"); exit(1); @@ -133,7 +133,7 @@ int main(int ac, char **av) { btrfs_commit_transaction(trans, root); close_ctree(root); - root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, O_RDWR); + root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, OPEN_CTREE_WRITES); if (!root) { fprintf(stderr, "Open ctree failed\n"); exit(1); @@ -153,7 +153,7 @@ int main(int ac, char **av) { btrfs_commit_transaction(trans, root); close_ctree(root); - root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, O_RDWR); + root = open_ctree(av[1], BTRFS_SUPER_INFO_OFFSET, OPEN_CTREE_WRITES); if (!root) { fprintf(stderr, "Open ctree failed\n"); exit(1); -- cgit v1.2.3