From 87ec1acaf66d6c65085a44f51b255613e9d5983e Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Thu, 9 Aug 2012 15:23:07 +0200 Subject: [PATCH] --- yaml --- r: 322223 b: refs/heads/master c: 8430f9772f9ac305211f177b0fa56a312175da11 h: refs/heads/master i: 322221: 1d7c598f62862ae01d5bcdfc91d4da5e61f9d952 322219: 0e42c93545f5b2e8c49389f269099e18d64706b4 322215: 02a6477bdbf0ef1869880ae33ebc158dd723ba5c 322207: a8551033e46380add6666995cefe65bfb5f1ef6b v: v3 --- [refs] | 2 +- trunk/mm/filemap.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aacee4b543c2..9384d87371f7 100644 --- 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 index fa5ca304148e..2b0952974cb9 100644 --- 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; }