]> git.hungrycats.org Git - linux/commitdiff
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)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Sun, 21 Dec 2014 22:08:15 +0000 (17:08 -0500)
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>
(cherry picked from commit f90523d1aa3c414031094ff2284d47791f0c0a05)

fs/btrfs/volumes.c

index 5651e39073ac5fc204277d241b6f06fd311a09db..5a7dccc2b89255f402124af1a1cbb979cb4bd3b1 100644 (file)
@@ -5167,8 +5167,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 */