From: Zhao Lei Date: Thu, 13 Nov 2014 03:45:39 +0000 (+0800) Subject: Btrfs: remove noused bbio_ret in __btrfs_map_block in condition X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f90523d1aa3c414031094ff2284d47791f0c0a05;p=openwrt%2Fstaging%2Fblogic.git Btrfs: remove noused bbio_ret in __btrfs_map_block in condition bbio_ret in this condition is always !NULL because previous code already have a check-and-skip: 4908 if (!bbio_ret) 4909 goto out; Signed-off-by: Zhao Lei Signed-off-by: Miao Xie Reviewed-by: David Sterba --- diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index d47289c715c8..20160aa44655 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5161,8 +5161,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, BTRFS_BLOCK_GROUP_RAID6)) { u64 tmp; - if (bbio_ret && ((rw & REQ_WRITE) || mirror_num > 1) - && raid_map_ret) { + if (raid_map_ret && ((rw & REQ_WRITE) || mirror_num > 1)) { int i, rot; /* push stripe_nr back to the start of the full stripe */