1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index 2164021f3b5f..a9fc24901eda 100644
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -210,6 +210,7 @@ struct stripe_head {
         int                     disks;          /* disks in stripe */
         enum check_states       check_state;
         enum reconstruct_states reconstruct_state;
+        spinlock_t              stripe_lock;
         /**
          * struct stripe_operations
          * @target - STRIPE_OP_COMPUTE_BLK target
@@ -273,6 +274,7 @@ enum r5dev_flags {
         R5_Wantwrite,
         R5_Overlap,     /* There is a pending overlapping request
                          * on this block */
+        R5_ReadNoMerge, /* prevent bio from merging in block-layer */
         R5_ReadError,   /* seen a read error here recently */
         R5_ReWrite,     /* have tried to over-write the readerror */
 
@@ -319,6 +321,7 @@ enum {
         STRIPE_BIOFILL_RUN,
         STRIPE_COMPUTE_RUN,
         STRIPE_OPS_REQ_PENDING,
+        STRIPE_ON_UNPLUG_LIST,
 };
 
 /*