diff options
| author | NeilBrown <neilb@suse.de> | 2011-07-27 03:00:36 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-07-27 03:00:36 +0200 |
| commit | 86c374ba9f6726a79a032ede741dc66d219b166e (patch) | |
| tree | 58bf8de967c300828e3176459455a86d68e27971 /drivers/md/raid5.c | |
| parent | md/raid5: move stripe_head_state and more code into handle_stripe. (diff) | |
| download | linux-86c374ba9f6726a79a032ede741dc66d219b166e.tar.xz linux-86c374ba9f6726a79a032ede741dc66d219b166e.zip | |
md/raid5: Remove stripe_head_state arg from handle_stripe_expansion.
This arg is only used to differentiate between RAID5 and RAID6 but
that is not needed. For RAID5, raid5_compute_sector will set qd_idx
to "~0" so j with certainly not equals qd_idx, so there is no need
for a guard on that condition.
So remove the guard and remove the arg from the declaration and
callers of handle_stripe_expansion.
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Namhyung Kim <namhyung@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/raid5.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 36873cfc3291..793dd76aeae0 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2921,8 +2921,7 @@ static void handle_parity_checks6(raid5_conf_t *conf, struct stripe_head *sh, } } -static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, - struct stripe_head_state *r6s) +static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh) { int i; @@ -2964,7 +2963,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags); for (j = 0; j < conf->raid_disks; j++) if (j != sh2->pd_idx && - (!r6s || j != sh2->qd_idx) && + j != sh2->qd_idx && !test_bit(R5_Expanded, &sh2->dev[j].flags)) break; if (j == conf->raid_disks) { @@ -3249,7 +3248,7 @@ static void handle_stripe5(struct stripe_head *sh, struct stripe_head_state *s) if (s->expanding && s->locked == 0 && !test_bit(STRIPE_COMPUTE_RUN, &sh->state)) - handle_stripe_expansion(conf, sh, NULL); + handle_stripe_expansion(conf, sh); } static void handle_stripe6(struct stripe_head *sh, struct stripe_head_state *s) @@ -3512,7 +3511,7 @@ static void handle_stripe6(struct stripe_head *sh, struct stripe_head_state *s) if (s->expanding && s->locked == 0 && !test_bit(STRIPE_COMPUTE_RUN, &sh->state)) - handle_stripe_expansion(conf, sh, s); + handle_stripe_expansion(conf, sh); } static void handle_stripe(struct stripe_head *sh) |