Messages in this thread Patch in this message | | | Date | Wed, 9 Sep 2015 00:18:50 +0000 | From | Alexandru Moise <> | Subject | [PATCH] btrfs: use a single if() statement for one outcome in get_block_rsv() |
| |
Rather than have three separate if() statements for the same outcome we should just OR them together in the same if() statement.
Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com> --- fs/btrfs/extent-tree.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 5411f0a..e8f2c15 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4890,13 +4890,9 @@ static struct btrfs_block_rsv *get_block_rsv( { struct btrfs_block_rsv *block_rsv = NULL; - if (test_bit(BTRFS_ROOT_REF_COWS, &root->state)) - block_rsv = trans->block_rsv; - - if (root == root->fs_info->csum_root && trans->adding_csums) - block_rsv = trans->block_rsv; - - if (root == root->fs_info->uuid_root) + if (test_bit(BTRFS_ROOT_REF_COWS, &root->state) || + (root == root->fs_info->csum_root && trans->adding_csums) || + (root == root->fs_info->uuid_root)) block_rsv = trans->block_rsv; if (!block_rsv) -- 2.5.1
| |