From: Vincent Stehlé <vincent.stehle@intel.com>
Date: Fri, 15 Jul 2016 15:03:21 +0000 (+0200)
Subject: Btrfs: fix comparison in __btrfs_map_block()
X-Git-Tag: v4.8-rc1~162^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=df5c82a8dcca1a5f23fefebae973d2dd0bf5aa11;p=linux.git

Btrfs: fix comparison in __btrfs_map_block()

Add missing comparison to op in expression, which was forgotten when doing
the REQ_OP transition.

Fixes: b3d3fa519905 ("btrfs: update __btrfs_map_block for REQ_OP transition")
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 14b2d19c842c..4ff9c06cb1be 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5494,7 +5494,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int op,
 		}
 
 	} else if (map->type & BTRFS_BLOCK_GROUP_DUP) {
-		if (op == REQ_OP_WRITE || REQ_OP_DISCARD ||
+		if (op == REQ_OP_WRITE || op == REQ_OP_DISCARD ||
 		    op == REQ_GET_READ_MIRRORS) {
 			num_stripes = map->num_stripes;
 		} else if (mirror_num) {