tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Linus Torvalds 4ccc8045 9d73fc2d

+2 -2
+1 -1
drivers/md/raid1.c
··· 963 963 struct r1conf *conf = mddev->private; 964 964 struct bio *bio; 965 965 966 - if (from_schedule) { 966 + if (from_schedule || current->bio_list) { 967 967 spin_lock_irq(&conf->device_lock); 968 968 bio_list_merge(&conf->pending_bio_list, &plug->pending); 969 969 conf->pending_count += plug->pending_cnt;
+1 -1
drivers/md/raid10.c
··· 1069 1069 struct r10conf *conf = mddev->private; 1070 1070 struct bio *bio; 1071 1071 1072 - if (from_schedule) { 1072 + if (from_schedule || current->bio_list) { 1073 1073 spin_lock_irq(&conf->device_lock); 1074 1074 bio_list_merge(&conf->pending_bio_list, &plug->pending); 1075 1075 conf->pending_count += plug->pending_cnt;