Btrfs: Include map_type in raid_bio

Corrent code use many kinds of "clever" way to determine operation
target's raid type, as:
  raid_map != NULL
  or
  raid_map[MAX_NR] == RAID[56]_Q_STRIPE

To make code easy to maintenance, this patch put raid type into
bbio, and we can always get raid type from bbio with a "stupid"
way.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index cbc416204452..5264858ed768 100644
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -994,10 +994,12 @@ static struct btrfs_raid_bio *alloc_rbio(struct btrfs_root *root,
         rbio->bio_pages = p + sizeof(struct page *) * num_pages;
         rbio->dbitmap = p + sizeof(struct page *) * num_pages * 2;
 
-        if (bbio->raid_map[real_stripes - 1] == RAID6_Q_STRIPE)
+        if (bbio->map_type & BTRFS_BLOCK_GROUP_RAID5)
+                nr_data = real_stripes - 1;
+        else if (bbio->map_type & BTRFS_BLOCK_GROUP_RAID6)
                 nr_data = real_stripes - 2;
         else
-                nr_data = real_stripes - 1;
+                BUG();
 
         rbio->nr_data = nr_data;
         return rbio;
@@ -1850,9 +1852,7 @@ static void __raid_recover_end_io(struct btrfs_raid_bio *rbio)
                 }
 
                 /* all raid6 handling here */
-                if (rbio->bbio->raid_map[rbio->real_stripes - 1] ==
-                    RAID6_Q_STRIPE) {
-
+                if (rbio->bbio->map_type & BTRFS_BLOCK_GROUP_RAID6) {
                         /*
                          * single failure, rebuild from parity raid5
                          * style