diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2014-11-13 11:45:39 +0800 |
|---|---|---|
| committer | Miao Xie <miaox@cn.fujitsu.com> | 2014-12-03 10:18:44 +0800 |
| commit | f90523d1aa3c414031094ff2284d47791f0c0a05 (patch) | |
| tree | 411bd5e58085d5e839b6911fdb6054ebfe78782e /fs/btrfs/volumes.c | |
| parent | 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (diff) | |
| download | op-kernel-dev-f90523d1aa3c414031094ff2284d47791f0c0a05.zip op-kernel-dev-f90523d1aa3c414031094ff2284d47791f0c0a05.tar.gz | |
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>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -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 d47289c..20160aa 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 */ |
