Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 14:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] md: fix locking problem in r5/r6

Browse Source 
bitmap_unplug actually writes data (bits) to storage, so we shouldn't be
holding a spinlock...

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown 2005-11-28 13:44:10 -08:00 committed by Linus Torvalds
parent 22dfdf5212
commit 700e432d83
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/raid5.c
View File

@ -1704,7 +1704,9 @@ static void raid5d (mddev_t *mddev)
if (conf->seq_flush - conf->seq_write > 0) { if (conf->seq_flush - conf->seq_write > 0) {
int seq = conf->seq_flush; int seq = conf->seq_flush;
spin_unlock_irq(&conf->device_lock);
bitmap_unplug(mddev->bitmap); bitmap_unplug(mddev->bitmap);
spin_lock_irq(&conf->device_lock);
conf->seq_write = seq; conf->seq_write = seq;
activate_bit_delay(conf); activate_bit_delay(conf);
} }

2
drivers/md/raid6main.c
View File

@ -1784,7 +1784,9 @@ static void raid6d (mddev_t *mddev)
if (conf->seq_flush - conf->seq_write > 0) { if (conf->seq_flush - conf->seq_write > 0) {
int seq = conf->seq_flush; int seq = conf->seq_flush;
spin_unlock_irq(&conf->device_lock);
bitmap_unplug(mddev->bitmap); bitmap_unplug(mddev->bitmap);
spin_lock_irq(&conf->device_lock);
conf->seq_write = seq; conf->seq_write = seq;
activate_bit_delay(conf); activate_bit_delay(conf);
} }