raid1: Add a filed freeze_array to indicate whether raid in freeze state.
PATCH 1/3 raid1: Add a filed freeze_array to indicate whether raid in freeze state.
Because the following patch will rewrite the contend between nornal IO and resync IO. So we used a parameter to indicate whether raid is in freeze array.
Signed-off-by Jianpeng Ma <[email protected]>
--- drivers/md/raid1.c | 15 +++++++-------- drivers/md/raid1.h | 1 + 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/md/raid1.c +7 -8
@@ -829,6 +829,7 @@ static void raise_barrier(struct r1conf *conf)/* Now wait for all pending IO to complete */ wait_event_lock_irq (conf->wait_barrier, + !conf->freeze_array && !conf->nr_pending && conf->barrier <RESYNC_DEPTH , conf->resync_lock);
@@ -860,10 +861,11 @@ static void wait_barrier(struct r1conf *conf)* count down. */ wait_event_lock_irq (conf->wait_barrier, - !conf->barrier || + !conf->freeze_array && + (!conf->barrier || (conf->nr_pending && current->bio_list && - !bio_list_empty (current->bio_list)), + !bio_list_empty (current->bio_list))), conf->resync_lock); conf->nr_waiting--; }
@@ -884,8 +886,7 @@ static void freeze_array(struct r1conf *conf, int extra) {/* stop syncio and normal IO and wait for everything to * go quite. -* We increment barrier and nr_waiting, and then -* wait until nr_pending match nr_queued+extra +* We wait until nr_pending match nr_queued+extra * This is called in the context of one normal IO request * that has failed. Thus any sync request that might be pending * will be blocked by nr_pending, and we need to wait for
@@ -895,8 +896,7 @@ static void freeze_array(struct r1conf *conf, int extra)* we continue. */ spin_lock_irq (&conf->resync_lock); - conf->barrier++; - conf->nr_waiting++; + conf->freeze_array =1 ; wait_event_lock_irq_cmd(conf->wait_barrier, conf->nr_pending == conf->nr_queued+extra, conf->resync_lock,
@@ -907,8 +907,7 @@ static void unfreeze_array(struct r1conf *conf) {/* reverse the effect of the freeze */ spin_lock_irq (&conf->resync_lock); - conf->barrier--; - conf->nr_waiting--; + conf->freeze_array =0 ;wake_up (&conf->wait_barrier);spin_unlock_irq (&conf->resync_lock); }
drivers/md/raid1.h +1 -0
@@ -65,6 +65,7 @@ struct r1conf {int nr_waiting;int nr_queued;int barrier; +int freeze_array;/* Set to 1 if a full sync is needed, (fresh device added). * Cleared when a sync completes.
Signature · 1 line
1.8.1.2