From 24e90a82c57392b1c307a2be6aa0b0b7e54a0c38 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Tue, 22 Jun 2010 12:52:14 +0200
Subject: [PATCH] --- yaml --- r: 242279 b: refs/heads/master c:
 2ed1a6bcf97a7ed787e6799bf2e80b9e6f51dca7 h: refs/heads/master i:   242277:
 240243e789c223d28c84cb41f9016ccf5b067ade   242275:
 9265d7736be90585b64c4a684ab994e6420dbddb   242271:
 066a1ca0da3fce9e0b900638cfc3c5dcd70427ff v: v3

---
 [refs]           | 2 +-
 trunk/fs/mpage.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d59d52b0ed4e..7483a520e12f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b417b1873694ece3291d7f64a943304559a817b
+refs/heads/master: 2ed1a6bcf97a7ed787e6799bf2e80b9e6f51dca7
diff --git a/trunk/fs/mpage.c b/trunk/fs/mpage.c
index d78455a81ec9..0afc809e46e0 100644
--- a/trunk/fs/mpage.c
+++ b/trunk/fs/mpage.c
@@ -364,6 +364,9 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
 	sector_t last_block_in_bio = 0;
 	struct buffer_head map_bh;
 	unsigned long first_logical_block = 0;
+	struct blk_plug plug;
+
+	blk_start_plug(&plug);
 
 	map_bh.b_state = 0;
 	map_bh.b_size = 0;
@@ -385,6 +388,7 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
 	BUG_ON(!list_empty(pages));
 	if (bio)
 		mpage_bio_submit(READ, bio);
+	blk_finish_plug(&plug);
 	return 0;
 }
 EXPORT_SYMBOL(mpage_readpages);
@@ -666,8 +670,11 @@ int
 mpage_writepages(struct address_space *mapping,
 		struct writeback_control *wbc, get_block_t get_block)
 {
+	struct blk_plug plug;
 	int ret;
 
+	blk_start_plug(&plug);
+
 	if (!get_block)
 		ret = generic_writepages(mapping, wbc);
 	else {
@@ -682,6 +689,7 @@ mpage_writepages(struct address_space *mapping,
 		if (mpd.bio)
 			mpage_bio_submit(WRITE, mpd.bio);
 	}
+	blk_finish_plug(&plug);
 	return ret;
 }
 EXPORT_SYMBOL(mpage_writepages);