openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md/raid5: STRIPE_ACTIVE has lock semantics, add barriers
  md/raid5: abort any pending parity operations when array fails.
This commit is contained in:
Linus Torvalds 2011-11-08 18:33:53 -08:00
parent c8c27c955a 257a4b42af
commit ed72a3d1b4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/md/raid5.c
View File

@ -3110,7 +3110,7 @@ static void handle_stripe(struct stripe_head *sh)
struct r5dev *pdev, *qdev; struct r5dev *pdev, *qdev;
clear_bit(STRIPE_HANDLE, &sh->state); clear_bit(STRIPE_HANDLE, &sh->state);
if (test_and_set_bit(STRIPE_ACTIVE, &sh->state)) { if (test_and_set_bit_lock(STRIPE_ACTIVE, &sh->state)) {
/* already being handled, ensure it gets handled /* already being handled, ensure it gets handled
* again when current action finishes */ * again when current action finishes */
set_bit(STRIPE_HANDLE, &sh->state); set_bit(STRIPE_HANDLE, &sh->state);
@ -3159,10 +3159,14 @@ static void handle_stripe(struct stripe_head *sh)
/* check if the array has lost more than max_degraded devices and, /* check if the array has lost more than max_degraded devices and,
* if so, some requests might need to be failed. * if so, some requests might need to be failed.
*/ */
if (s.failed > conf->max_degraded && s.to_read+s.to_write+s.written) if (s.failed > conf->max_degraded) {
handle_failed_stripe(conf, sh, &s, disks, &s.return_bi); sh->check_state = 0;
if (s.failed > conf->max_degraded && s.syncing) sh->reconstruct_state = 0;
handle_failed_sync(conf, sh, &s); if (s.to_read+s.to_write+s.written)
handle_failed_stripe(conf, sh, &s, disks, &s.return_bi);
if (s.syncing)
handle_failed_sync(conf, sh, &s);
}
/* /*
* might be able to return some write requests if the parity blocks * might be able to return some write requests if the parity blocks
@ -3371,7 +3375,7 @@ static void handle_stripe(struct stripe_head *sh)
return_io(s.return_bi); return_io(s.return_bi);
clear_bit(STRIPE_ACTIVE, &sh->state); clear_bit_unlock(STRIPE_ACTIVE, &sh->state);
} }
static void raid5_activate_delayed(struct r5conf *conf) static void raid5_activate_delayed(struct r5conf *conf)