Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f90523d1 authored by Zhao Lei's avatar Zhao Lei Committed by Miao Xie
Browse files

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: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 5d01410f

fs/btrfs/volumes.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -5161,8 +5161,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, 
				BTRFS_BLOCK_GROUP_RAID6)) {

				BTRFS_BLOCK_GROUP_RAID6)) {

		u64 tmp;

		u64 tmp;





		if (bbio_ret && ((rw & REQ_WRITE) || mirror_num > 1)

		if (raid_map_ret && ((rw & REQ_WRITE) || mirror_num > 1)) {

		    && raid_map_ret) {

			int i, rot;

			int i, rot;





			/* push stripe_nr back to the start of the full stripe */

			/* push stripe_nr back to the start of the full stripe */