commit 15b0a89d71ae2573ed1c3b168f08320527eed34e
author Henrik Nordvik <henrikno@gmail.com> Mon Apr 29 18:09:23 2013 +0000
committer Josef Bacik <jbacik@fusionio.com> Fri Jun 14 11:29:14 2013 -0400
tree 92f64ace2b3ca28d0089ce2e8dfb72227c1fe2de
parent 13e6c37b989859e70b0d73d3f2cb0aa022159b17

Btrfs: fix check on same raid type flag twice

Code checked for raid 5 flag in two else-if branches, so code would never be reached. Probably a copy-paste bug.

Signed-off-by: Henrik Nordvik <henrikno@gmail.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>

fs/btrfs/disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index b8b60b6..aecf788 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3258,7 +3258,7 @@
 					    BTRFS_BLOCK_GROUP_RAID10)) {
 						num_tolerated_disk_barrier_failures = 1;
 					} else if (flags &
-						   BTRFS_BLOCK_GROUP_RAID5) {
+						   BTRFS_BLOCK_GROUP_RAID6) {
 						num_tolerated_disk_barrier_failures = 2;
 					}
 				}