lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'md-3.7-fixes' of git://neil.brown.name/md

Browse Source 
Pull md bugfix from NeilBrown:
 "Single bugfix for raid1/raid10.

  Fixes a recently introduced deadlock."

* tag 'md-3.7-fixes' of git://neil.brown.name/md:
  md/raid1{,0}: fix deadlock in bitmap_unplug.
This commit is contained in:
Linus Torvalds
2012-12-02 16:24:31 -08:00
parent 9d73fc2d64 874807a831
commit 4ccc804586
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/raid1.c
View File

@@ -963,7 +963,7 @@ static void raid1_unplug(struct blk_plug_cb *cb, bool from_schedule)
struct r1conf *conf = mddev->private; struct r1conf *conf = mddev->private;
struct bio *bio; struct bio *bio;
if (from_schedule) { if (from_schedule || current->bio_list) {
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
bio_list_merge(&conf->pending_bio_list, &plug->pending); bio_list_merge(&conf->pending_bio_list, &plug->pending);
conf->pending_count += plug->pending_cnt; conf->pending_count += plug->pending_cnt;

2
drivers/md/raid10.c
View File

@@ -1069,7 +1069,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)
struct r10conf *conf = mddev->private; struct r10conf *conf = mddev->private;
struct bio *bio; struct bio *bio;
if (from_schedule) { if (from_schedule || current->bio_list) {
spin_lock_irq(&conf->device_lock); spin_lock_irq(&conf->device_lock);
bio_list_merge(&conf->pending_bio_list, &plug->pending); bio_list_merge(&conf->pending_bio_list, &plug->pending);
conf->pending_count += plug->pending_cnt; conf->pending_count += plug->pending_cnt;