Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / raid / raid1.h

diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index abbfdd9..3009c81 100644 (file)
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -36,18 +36,30 @@ struct r1_private_data_s {
        spinlock_t              device_lock;
 
        struct list_head        retry_list;
+       /* queue pending writes and submit them on unplug */
+       struct bio_list         pending_bio_list;
+       /* queue of writes that have been unplugged */
+       struct bio_list         flushing_bio_list;
+
        /* for use when syncing mirrors: */
 
        spinlock_t              resync_lock;
-       int nr_pending;
-       int barrier;
+       int                     nr_pending;
+       int                     nr_waiting;
+       int                     nr_queued;
+       int                     barrier;
        sector_t                next_resync;
+       int                     fullsync;  /* set to 1 if a full sync is needed,
+                                           * (fresh device added).
+                                           * Cleared when a sync completes.
+                                           */
 
-       wait_queue_head_t       wait_idle;
-       wait_queue_head_t       wait_resume;
+       wait_queue_head_t       wait_barrier;
 
        struct pool_info        *poolinfo;
 
+       struct page             *tmppage;
+
        mempool_t *r1bio_pool;
        mempool_t *r1buf_pool;
 };
@@ -71,6 +83,9 @@ struct r1bio_s {
        atomic_t                remaining; /* 'have we finished' count,
                                            * used from IRQ handlers
                                            */
+       atomic_t                behind_remaining; /* number of write-behind ios remaining
+                                                * in this BehindIO request
+                                                */
        sector_t                sector;
        int                     sectors;
        unsigned long           state;
@@ -85,14 +100,36 @@ struct r1bio_s {
        int                     read_disk;
 
        struct list_head        retry_list;
+       struct bitmap_update    *bitmap_update;
        /*
         * if the IO is in WRITE direction, then multiple bios are used.
         * We choose the number when they are allocated.
         */
        struct bio              *bios[0];
+       /* DO NOT PUT ANY NEW FIELDS HERE - bios array is contiguously alloced*/
 };
 
+/* when we get a read error on a read-only array, we redirect to another
+ * device without failing the first device, or trying to over-write to
+ * correct the read error.  To keep track of bad blocks on a per-bio
+ * level, we store IO_BLOCKED in the appropriate 'bios' pointer
+ */
+#define IO_BLOCKED ((struct bio*)1)
+
 /* bits for r1bio.state */
 #define        R1BIO_Uptodate  0
 #define        R1BIO_IsSync    1
+#define        R1BIO_Degraded  2
+#define        R1BIO_BehindIO  3
+#define        R1BIO_Barrier   4
+#define R1BIO_BarrierRetry 5
+/* For write-behind requests, we call bi_end_io when
+ * the last non-write-behind device completes, providing
+ * any write was successful.  Otherwise we call when
+ * any write-behind write succeeds, otherwise we call
+ * with failure when last write completes (and all failed).
+ * Record that bi_end_io was called with this flag...
+ */
+#define        R1BIO_Returned 6
+
 #endif