[PATCH 1/9] Btrfs: remove noused bbio_ret in __btrfs_map_block in condition

[Miao Xie]

From: Zhao Lei 

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 
Signed-off-by: Miao Xie 
---
 fs/btrfs/volumes.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f61278f..41b0dff 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5162,8 +5162,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 
*/
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/9] Btrfs: remove noused bbio_ret in __btrfs_map_block in condition

[David Sterba]

On Fri, Nov 14, 2014 at 09:50:53PM +0800, Miao Xie wrote:
> From: Zhao Lei 
> 
> 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 
> Signed-off-by: Miao Xie 

Reviewed-by: David Sterba 
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html