---

yaml --- r: 322223 b: refs/heads/master c: 8430f97 h: refs/heads/master i: 322221: 1d7c598 322219: 0e42c93 322215: 02a6477 322207: a855103 v: v3
git-mirror · Aug 9, 2012 · 87ec1ac · 87ec1ac
1 parent 707a63f
commit 87ec1ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 276f0f5d157bb4a816053f4f3a941dbcd4f76556
+refs/heads/master: 8430f9772f9ac305211f177b0fa56a312175da11
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
@@ -2527,14 +2527,12 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 {
 	struct file *file = iocb->ki_filp;
 	struct inode *inode = file->f_mapping->host;
-	struct blk_plug plug;
 	ssize_t ret;
 
 	BUG_ON(iocb->ki_pos != pos);
 
 	sb_start_write(inode->i_sb);
 	mutex_lock(&inode->i_mutex);
-	blk_start_plug(&plug);
 	ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
 	mutex_unlock(&inode->i_mutex);
 
@@ -2545,7 +2543,6 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 		if (err < 0 && ret > 0)
 			ret = err;
 	}
-	blk_finish_plug(&plug);
 	sb_end_write(inode->i_sb);
 	return ret;
 }