Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h
index 0ff3715fb7eb..9bebca7bff2f 100644
--- a/drivers/md/raid1.h
+++ b/drivers/md/raid1.h
@@ -41,6 +41,19 @@ struct r1conf {
          */
         sector_t                next_resync;
 
+        /* When raid1 starts resync, we divide array into four partitions
+         * |---------|--------------|---------------------|-------------|
+         *        next_resync   start_next_window       end_window
+         * start_next_window = next_resync + NEXT_NORMALIO_DISTANCE
+         * end_window = start_next_window + NEXT_NORMALIO_DISTANCE
+         * current_window_requests means the count of normalIO between
+         *   start_next_window and end_window.
+         * next_window_requests means the count of normalIO after end_window.
+         * */
+        sector_t                start_next_window;
+        int                     current_window_requests;
+        int                     next_window_requests;
+
         spinlock_t              device_lock;
 
         /* list of 'struct r1bio' that need to be processed by raid1d,
@@ -65,6 +78,7 @@ struct r1conf {
         int                     nr_waiting;
         int                     nr_queued;
         int                     barrier;
+        int                     array_frozen;
 
         /* Set to 1 if a full sync is needed, (fresh device added).
          * Cleared when a sync completes.
@@ -111,6 +125,7 @@ struct r1bio {
                                                  * in this BehindIO request
                                                  */
         sector_t                sector;
+        sector_t                start_next_window;
         int                     sectors;
         unsigned long           state;
         struct mddev            *mddev;