Merge branches 'ib-mfd-extcon-regulator-3.17', 'ib-mfd-gpio-3.17' and 'ib-mfd-mmc...

[cascardo/linux.git] / drivers / md / raid5.h

diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index 01ad8ae..bc72cd4 100644 (file)
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -232,7 +232,7 @@ struct stripe_head {
                 */
                struct bio      req, rreq;
                struct bio_vec  vec, rvec;
-               struct page     *page;
+               struct page     *page, *orig_page;
                struct bio      *toread, *read, *towrite, *written;
                sector_t        sector;                 /* sector of this page */
                unsigned long   flags;
@@ -299,6 +299,7 @@ enum r5dev_flags {
                         * data in, and now is a good time to write it out.
                         */
        R5_Discard,     /* Discard the stripe */
+       R5_SkipCopy,    /* Don't copy data from bio to stripe cache */
 };
 
 /*
@@ -436,6 +437,7 @@ struct r5conf {
        atomic_t                pending_full_writes; /* full write backlog */
        int                     bypass_count; /* bypassed prereads */
        int                     bypass_threshold; /* preread nice */
+       int                     skip_copy; /* Don't copy data from bio to stripe cache */
        struct list_head        *last_hold; /* detect hold_list promotions */
 
        atomic_t                reshape_stripes; /* stripes with pending writes for reshape */