From c02b4adcb6a529a29f429db3020405f9aefc2f0d Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 12 Feb 2015 13:41:00 +0100 Subject: [PATCH] btrfs-progs: fix typo in OPEN_CTREE flag Introduced in "btrfs-progs: Add new btrfs_open_ctree_flags CHUNK_ONLY" by my local fixups. Signed-off-by: David Sterba --- disk-io.c | 6 +++--- disk-io.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/disk-io.c b/disk-io.c index b709ff5b..c1cf1466 100644 --- a/disk-io.c +++ b/disk-io.c @@ -1197,7 +1197,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, BTRFS_UUID_SIZE); ret = btrfs_setup_all_roots(fs_info, root_tree_bytenr, flags); - if (ret && !(flags & __OPEN_CTREEE_RETURN_CHUNK_ROOT)) + if (ret && !(flags & __OPEN_CTREE_RETURN_CHUNK_ROOT)) goto out_chunk; return fs_info; @@ -1242,7 +1242,7 @@ struct btrfs_root *open_ctree(const char *filename, u64 sb_bytenr, info = open_ctree_fs_info(filename, sb_bytenr, 0, flags); if (!info) return NULL; - if (flags & __OPEN_CTREEE_RETURN_CHUNK_ROOT) + if (flags & __OPEN_CTREE_RETURN_CHUNK_ROOT) return info->chunk_root; return info->fs_root; } @@ -1254,7 +1254,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr, info = __open_ctree_fd(fp, path, sb_bytenr, 0, flags); if (!info) return NULL; - if (flags & __OPEN_CTREEE_RETURN_CHUNK_ROOT) + if (flags & __OPEN_CTREE_RETURN_CHUNK_ROOT) return info->chunk_root; return info->fs_root; } diff --git a/disk-io.h b/disk-io.h index 7a2a597f..4caebeb1 100644 --- a/disk-io.h +++ b/disk-io.h @@ -40,10 +40,10 @@ enum btrfs_open_ctree_flags { */ OPEN_CTREE_SUPPRESS_CHECK_BLOCK_ERRORS = (1 << 8), /* Return chunk root */ - __OPEN_CTREEE_RETURN_CHUNK_ROOT = (1 << 9), + __OPEN_CTREE_RETURN_CHUNK_ROOT = (1 << 9), OPEN_CTREE_CHUNK_ROOT_ONLY = OPEN_CTREE_PARTIAL + OPEN_CTREE_SUPPRESS_CHECK_BLOCK_ERRORS + - __OPEN_CTREEE_RETURN_CHUNK_ROOT, + __OPEN_CTREE_RETURN_CHUNK_ROOT, /* * TODO: cleanup: Split the open_ctree_flags into more indepent * tree bits.