Merge tty-next into 3.6-rc1

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

diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index f03fb3395183bdb580923e9154d0b2405cf3b4f3..a9fc24901edad817b599219e9fb4c596c4c9e29b 100644 (file)
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -274,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 */
 
@@ -320,6 +321,7 @@ enum {
        STRIPE_BIOFILL_RUN,
        STRIPE_COMPUTE_RUN,
        STRIPE_OPS_REQ_PENDING,
+       STRIPE_ON_UNPLUG_LIST,
 };
 
 /*