From ad0291c246eaffd3c7e67d9155001bc643bd06a0 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Thu, 1 Jul 2010 07:55:01 +0200
Subject: [PATCH] --- yaml --- r: 242280 b: refs/heads/master c:
 9f5b9425468c85a901d863d241ba5c5dff9b23b8 h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/fs/aio.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7483a520e12f..9af2df0aaad1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ed1a6bcf97a7ed787e6799bf2e80b9e6f51dca7
+refs/heads/master: 9f5b9425468c85a901d863d241ba5c5dff9b23b8
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
index c5ea494ea9e2..1476bed1c5fb 100644
--- a/trunk/fs/aio.c
+++ b/trunk/fs/aio.c
@@ -1660,6 +1660,7 @@ long do_io_submit(aio_context_t ctx_id, long nr,
 	long ret = 0;
 	int i;
 	struct hlist_head batch_hash[AIO_BATCH_HASH_SIZE] = { { 0, }, };
+	struct blk_plug plug;
 
 	if (unlikely(nr < 0))
 		return -EINVAL;
@@ -1676,6 +1677,8 @@ long do_io_submit(aio_context_t ctx_id, long nr,
 		return -EINVAL;
 	}
 
+	blk_start_plug(&plug);
+
 	/*
 	 * AKPM: should this return a partial result if some of the IOs were
 	 * successfully submitted?
@@ -1698,6 +1701,7 @@ long do_io_submit(aio_context_t ctx_id, long nr,
 		if (ret)
 			break;
 	}
+	blk_finish_plug(&plug);
 	aio_batch_free(batch_hash);
 
 	put_ioctx(ctx);