diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-06-28 08:31:53 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@notabene.brown> | 2008-06-28 08:31:53 +1000 |
| commit | c4e5ac0a22e664eecf29249553cf16c2433f5f25 (patch) | |
| tree | 898a3b7f4b80d54d15d5b415397b1f4dd588e116 /drivers/md/raid5.c | |
| parent | 2b7497f0e0a0b9cf21d822e427d5399b2056501a (diff) | |
| download | linux-3.10-c4e5ac0a22e664eecf29249553cf16c2433f5f25.tar.gz linux-3.10-c4e5ac0a22e664eecf29249553cf16c2433f5f25.tar.bz2 linux-3.10-c4e5ac0a22e664eecf29249553cf16c2433f5f25.zip | |
md: use stripe_head_state in ops_run_io()
From: Dan Williams <dan.j.williams@intel.com>
In handle_stripe after taking sh->lock we sample some bits into 's' (struct
stripe_head_state):
s.syncing = test_bit(STRIPE_SYNCING, &sh->state);
s.expanding = test_bit(STRIPE_EXPAND_SOURCE, &sh->state);
s.expanded = test_bit(STRIPE_EXPAND_READY, &sh->state);
Use these values from 's' in ops_run_io() rather than re-sampling the bits.
This ensures a consistent snapshot (as seen under sh->lock) is used.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index cac97080b27..c4ef3071c29 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -390,7 +390,7 @@ raid5_end_read_request(struct bio *bi, int error); static void raid5_end_write_request(struct bio *bi, int error); -static void ops_run_io(struct stripe_head *sh) +static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s) { raid5_conf_t *conf = sh->raid_conf; int i, disks = sh->disks; @@ -425,9 +425,7 @@ static void ops_run_io(struct stripe_head *sh) rcu_read_unlock(); if (rdev) { - if (test_bit(STRIPE_SYNCING, &sh->state) || - test_bit(STRIPE_EXPAND_SOURCE, &sh->state) || - test_bit(STRIPE_EXPAND_READY, &sh->state)) + if (s->syncing || s->expanding || s->expanded) md_sync_acct(rdev->bdev, STRIPE_SECTORS); set_bit(STRIPE_IO_STARTED, &sh->state); @@ -2902,10 +2900,9 @@ static void handle_stripe5(struct stripe_head *sh) if (pending) raid5_run_ops(sh, pending); - ops_run_io(sh); + ops_run_io(sh, &s); return_io(return_bi); - } static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page) |