Btrfs: remove noused bbio_ret in __btrfs_map_block in condition
authorZhao Lei <zhaolei@cn.fujitsu.com>
Thu, 13 Nov 2014 03:45:39 +0000 (11:45 +0800)
committerMiao Xie <miaox@cn.fujitsu.com>
Wed, 3 Dec 2014 02:18:44 +0000 (10:18 +0800)
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 <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
fs/btrfs/volumes.c

index d47289c715c814f47c7842349afc942640310238..20160aa44655aae68a25fe0f37d3ccbdcbb33440 100644 (file)
@@ -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 */