Merge tag 'for-5.1/block-post-20190315' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / md / raid5-ppl.c

diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index f2b3020..17e9e7d 100644 (file)
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -16,7 +16,6 @@
 #include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/crc32c.h>
-#include <linux/flex_array.h>
 #include <linux/async_tx.h>
 #include <linux/raid/md_p.h>
 #include "md.h"
@@ -168,7 +167,7 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu,
                       struct dma_async_tx_descriptor *tx)
 {
        int disks = sh->disks;
-       struct page **srcs = flex_array_get(percpu->scribble, 0);
+       struct page **srcs = percpu->scribble;
        int count = 0, pd_idx = sh->pd_idx, i;
        struct async_submit_ctl submit;
 
@@ -199,8 +198,7 @@ ops_run_partial_parity(struct stripe_head *sh, struct raid5_percpu *percpu,
        }
 
        init_async_submit(&submit, ASYNC_TX_FENCE|ASYNC_TX_XOR_ZERO_DST, tx,
-                         NULL, sh, flex_array_get(percpu->scribble, 0)
-                         + sizeof(struct page *) * (sh->disks + 2));
+                         NULL, sh, (void *) (srcs + sh->disks + 2));
 
        if (count == 1)
                tx = async_memcpy(sh->ppl_page, srcs[0], 0, 0, PAGE_SIZE,