diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index f75698b1f63d..816157e7d8e0 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -43,8 +43,12 @@ | |||
43 | * miss any bits. | 43 | * miss any bits. |
44 | */ | 44 | */ |
45 | 45 | ||
46 | #include <linux/blkdev.h> | ||
47 | #include <linux/raid/md_k.h> | ||
46 | #include <linux/kthread.h> | 48 | #include <linux/kthread.h> |
47 | #include <linux/async_tx.h> | 49 | #include <linux/async_tx.h> |
50 | #include <linux/seq_file.h> | ||
51 | #include "raid5.h" | ||
48 | #include "raid6.h" | 52 | #include "raid6.h" |
49 | #include "bitmap.h" | 53 | #include "bitmap.h" |
50 | 54 | ||
@@ -1467,7 +1471,7 @@ static void copy_data(int frombio, struct bio *bio, | |||
1467 | 1471 | ||
1468 | static void compute_parity6(struct stripe_head *sh, int method) | 1472 | static void compute_parity6(struct stripe_head *sh, int method) |
1469 | { | 1473 | { |
1470 | raid6_conf_t *conf = sh->raid_conf; | 1474 | raid5_conf_t *conf = sh->raid_conf; |
1471 | int i, pd_idx = sh->pd_idx, qd_idx, d0_idx, disks = sh->disks, count; | 1475 | int i, pd_idx = sh->pd_idx, qd_idx, d0_idx, disks = sh->disks, count; |
1472 | struct bio *chosen; | 1476 | struct bio *chosen; |
1473 | /**** FIX THIS: This could be very bad if disks is close to 256 ****/ | 1477 | /**** FIX THIS: This could be very bad if disks is close to 256 ****/ |
@@ -2795,7 +2799,7 @@ static bool handle_stripe5(struct stripe_head *sh) | |||
2795 | 2799 | ||
2796 | static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page) | 2800 | static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page) |
2797 | { | 2801 | { |
2798 | raid6_conf_t *conf = sh->raid_conf; | 2802 | raid5_conf_t *conf = sh->raid_conf; |
2799 | int disks = sh->disks; | 2803 | int disks = sh->disks; |
2800 | struct bio *return_bi = NULL; | 2804 | struct bio *return_bi = NULL; |
2801 | int i, pd_idx = sh->pd_idx; | 2805 | int i, pd_idx = sh->pd_idx; |