summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2017-12-01 12:12:34 -0800
committerShaohua Li <shli@fb.com>2017-12-01 12:19:48 -0800
commit18022a1bd3709b74ca31ef0b28fccd52bcd6c504 (patch)
treee3d3fe238bd4397f503adca6dac7688e8feb933e /drivers/md/raid10.c
parentd2e2ec8222b4cb49c59f6dc6f5c4fe6fb4c80de9 (diff)
downloadlinux-stable-18022a1bd3709b74ca31ef0b28fccd52bcd6c504.tar.gz
linux-stable-18022a1bd3709b74ca31ef0b28fccd52bcd6c504.tar.bz2
linux-stable-18022a1bd3709b74ca31ef0b28fccd52bcd6c504.zip
md/raid1/10: add missed blk plug
flush_pending_writes isn't always called with block plug, so add it, and plug works in nested way. Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b9edbc747a95..c131835cf008 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -894,10 +894,13 @@ static void flush_pending_writes(struct r10conf *conf)
spin_lock_irq(&conf->device_lock);
if (conf->pending_bio_list.head) {
+ struct blk_plug plug;
struct bio *bio;
+
bio = bio_list_get(&conf->pending_bio_list);
conf->pending_count = 0;
spin_unlock_irq(&conf->device_lock);
+ blk_start_plug(&plug);
/* flush any pending bitmap writes to disk
* before proceeding w/ I/O */
bitmap_unplug(conf->mddev->bitmap);
@@ -918,6 +921,7 @@ static void flush_pending_writes(struct r10conf *conf)
generic_make_request(bio);
bio = next;
}
+ blk_finish_plug(&plug);
} else
spin_unlock_irq(&conf->device_lock);
}