Skip to content

Commit 184a09e

Browse files
qnap-dennisyangshligit
authored andcommitted
md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list
In release_stripe_plug(), if a stripe_head has its STRIPE_ON_UNPLUG_LIST set, it indicates that this stripe_head is already in the raid5_plug_cb list and release_stripe() would be called instead to drop a reference count. Otherwise, the STRIPE_ON_UNPLUG_LIST bit would be set for this stripe_head and it will get queued into the raid5_plug_cb list. Since break_stripe_batch_list() did not preserve STRIPE_ON_UNPLUG_LIST, A stripe could be re-added to plug list while it is still on that list in the following situation. If stripe_head A is added to another stripe_head B's batch list, in this case A will have its batch_head != NULL and be added into the plug list. After that, stripe_head B gets handled and called break_stripe_batch_list() to reset all the batched stripe_head(including A which is still on the plug list)'s state and reset their batch_head to NULL. Before the plug list gets processed, if there is another write request comes in and get stripe_head A, A will have its batch_head == NULL (cleared by calling break_stripe_batch_list() on B) and be added to plug list once again. Signed-off-by: Dennis Yang <[email protected]> Cc: [email protected] (v4.1+) Signed-off-by: Shaohua Li <[email protected]>
1 parent 3664847 commit 184a09e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/md/raid5.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4605,7 +4605,8 @@ static void break_stripe_batch_list(struct stripe_head *head_sh,
46054605

46064606
set_mask_bits(&sh->state, ~(STRIPE_EXPAND_SYNC_FLAGS |
46074607
(1 << STRIPE_PREREAD_ACTIVE) |
4608-
(1 << STRIPE_DEGRADED)),
4608+
(1 << STRIPE_DEGRADED) |
4609+
(1 << STRIPE_ON_UNPLUG_LIST)),
46094610
head_sh->state & (1 << STRIPE_INSYNC));
46104611

46114612
sh->check_state = head_sh->check_state;

0 commit comments

Comments
 (0)