Jelajahi Sumber

raid5: add a new state for stripe log handling

When a stripe finishes construction, we write the stripe to raid in
ops_run_io normally. With log, we do a bunch of other operations before
the stripe is written to raid. Mainly write the stripe to log disk,
flush disk cache and so on. The operations are still driven by raid5d
and run in the stripe state machine. We introduce a new state for such
stripe (trapped into log). The stripe is in this state from the time it
first enters ops_run_io (finish construction) to the time it is written
to raid. Since we know the state is only for log, we bypass other
check/operation in handle_stripe.

Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Shaohua Li 10 tahun lalu
induk
melakukan
b70abcb247
2 mengubah file dengan 4 tambahan dan 0 penghapusan
  1. 3 0
      drivers/md/raid5.c
  2. 1 0
      drivers/md/raid5.h

+ 3 - 0
drivers/md/raid5.c

@@ -4316,6 +4316,9 @@ static void handle_stripe(struct stripe_head *sh)
 
 
 	analyse_stripe(sh, &s);
 	analyse_stripe(sh, &s);
 
 
+	if (test_bit(STRIPE_LOG_TRAPPED, &sh->state))
+		goto finish;
+
 	if (s.handle_bad_blocks) {
 	if (s.handle_bad_blocks) {
 		set_bit(STRIPE_HANDLE, &sh->state);
 		set_bit(STRIPE_HANDLE, &sh->state);
 		goto finish;
 		goto finish;

+ 1 - 0
drivers/md/raid5.h

@@ -340,6 +340,7 @@ enum {
 	STRIPE_BITMAP_PENDING,	/* Being added to bitmap, don't add
 	STRIPE_BITMAP_PENDING,	/* Being added to bitmap, don't add
 				 * to batch yet.
 				 * to batch yet.
 				 */
 				 */
+	STRIPE_LOG_TRAPPED, /* trapped into log */
 };
 };
 
 
 #define STRIPE_EXPAND_SYNC_FLAGS \
 #define STRIPE_EXPAND_SYNC_FLAGS \