mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
md: fix merge error
The original STRIPE_OP_IO removal patch had the following hunk: - for (i = conf->raid_disks; i--; ) { + for (i = conf->raid_disks; i--; ) set_bit(R5_Wantwrite, &sh->dev[i].flags); - if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending)) - sh->ops.count++; - } However it appears the hunk became broken after merging: - for (i = conf->raid_disks; i--; ) { + for (i = conf->raid_disks; i--; ) set_bit(R5_Wantwrite, &sh->dev[i].flags); set_bit(R5_LOCKED, &dev->flags); s.locked++; - if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending)) - sh->ops.count++; - } Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
c9f21aaff1
commit
2339788376
1 changed files with 3 additions and 2 deletions
|
@ -2717,11 +2717,12 @@ static void handle_stripe5(struct stripe_head *sh)
|
||||||
if (sh->reconstruct_state == reconstruct_state_result) {
|
if (sh->reconstruct_state == reconstruct_state_result) {
|
||||||
sh->reconstruct_state = reconstruct_state_idle;
|
sh->reconstruct_state = reconstruct_state_idle;
|
||||||
clear_bit(STRIPE_EXPANDING, &sh->state);
|
clear_bit(STRIPE_EXPANDING, &sh->state);
|
||||||
for (i = conf->raid_disks; i--; )
|
for (i = conf->raid_disks; i--; ) {
|
||||||
set_bit(R5_Wantwrite, &sh->dev[i].flags);
|
set_bit(R5_Wantwrite, &sh->dev[i].flags);
|
||||||
set_bit(R5_LOCKED, &dev->flags);
|
set_bit(R5_LOCKED, &sh->dev[i].flags);
|
||||||
s.locked++;
|
s.locked++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (s.expanded && test_bit(STRIPE_EXPANDING, &sh->state) &&
|
if (s.expanded && test_bit(STRIPE_EXPANDING, &sh->state) &&
|
||||||
!sh->reconstruct_state) {
|
!sh->reconstruct_state) {
|
||||||
|
|
Loading…
Reference in a new issue