diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-02 19:24:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-02 19:24:31 -0500 |
| commit | 4ccc804586c9ad1622687a24223c6ad2955759cc (patch) | |
| tree | 4cb881b7dcd3b63b53756b8d7362c835d1c312f1 /drivers/md | |
| parent | 9d73fc2d641f8831c9dc803177fe47c02120cc36 (diff) | |
| parent | 874807a83139abc094f939e93623c5623573d543 (diff) | |
Merge tag 'md-3.7-fixes' of git://neil.brown.name/md
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.
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 2 | ||||
| -rw-r--r-- | drivers/md/raid10.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 636bae0405e..a0f73092176 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -963,7 +963,7 @@ static void raid1_unplug(struct blk_plug_cb *cb, bool from_schedule) | |||
| 963 | struct r1conf *conf = mddev->private; | 963 | struct r1conf *conf = mddev->private; |
| 964 | struct bio *bio; | 964 | struct bio *bio; |
| 965 | 965 | ||
| 966 | if (from_schedule) { | 966 | if (from_schedule || current->bio_list) { |
| 967 | spin_lock_irq(&conf->device_lock); | 967 | spin_lock_irq(&conf->device_lock); |
| 968 | bio_list_merge(&conf->pending_bio_list, &plug->pending); | 968 | bio_list_merge(&conf->pending_bio_list, &plug->pending); |
| 969 | conf->pending_count += plug->pending_cnt; | 969 | conf->pending_count += plug->pending_cnt; |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 0d5d0ff2c0f..c9acbd71713 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1069,7 +1069,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule) | |||
| 1069 | struct r10conf *conf = mddev->private; | 1069 | struct r10conf *conf = mddev->private; |
| 1070 | struct bio *bio; | 1070 | struct bio *bio; |
| 1071 | 1071 | ||
| 1072 | if (from_schedule) { | 1072 | if (from_schedule || current->bio_list) { |
| 1073 | spin_lock_irq(&conf->device_lock); | 1073 | spin_lock_irq(&conf->device_lock); |
| 1074 | bio_list_merge(&conf->pending_bio_list, &plug->pending); | 1074 | bio_list_merge(&conf->pending_bio_list, &plug->pending); |
| 1075 | conf->pending_count += plug->pending_cnt; | 1075 | conf->pending_count += plug->pending_cnt; |