diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2014-11-12 22:45:39 -0500 |
|---|---|---|
| committer | Miao Xie <miaox@cn.fujitsu.com> | 2014-12-02 21:18:44 -0500 |
| commit | f90523d1aa3c414031094ff2284d47791f0c0a05 (patch) | |
| tree | 411bd5e58085d5e839b6911fdb6054ebfe78782e | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
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 <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
| -rw-r--r-- | fs/btrfs/volumes.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, | |||
| 5161 | BTRFS_BLOCK_GROUP_RAID6)) { | 5161 | BTRFS_BLOCK_GROUP_RAID6)) { |
| 5162 | u64 tmp; | 5162 | u64 tmp; |
| 5163 | 5163 | ||
| 5164 | if (bbio_ret && ((rw & REQ_WRITE) || mirror_num > 1) | 5164 | if (raid_map_ret && ((rw & REQ_WRITE) || mirror_num > 1)) { |
| 5165 | && raid_map_ret) { | ||
| 5166 | int i, rot; | 5165 | int i, rot; |
| 5167 | 5166 | ||
| 5168 | /* push stripe_nr back to the start of the full stripe */ | 5167 | /* push stripe_nr back to the start of the full stripe */ |