diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-07 15:02:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-07 15:02:20 -0700 |
| commit | cba82925c249e9d001ce98fef17d9c6360d86e70 (patch) | |
| tree | 1076140e2e51da648a9f8dcc35a5f2e8a95a0240 /fs/block_dev.c | |
| parent | 301fd5c13257862df66c81c48d963d474e63e0ef (diff) | |
| parent | 7a5deff68f9e0a1db170ac9dd3b2b4aaddc1b80c (diff) | |
| download | blackbird-op-linux-cba82925c249e9d001ce98fef17d9c6360d86e70.tar.gz blackbird-op-linux-cba82925c249e9d001ce98fef17d9c6360d86e70.zip | |
Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc
* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Remove board specific GPIO init
ARM: LPC32xx: Provide DMA filter callbacks via platform data
ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
+ sync to 3.6-rc4
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 1e519195d45b..38e721b35d45 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1578,10 +1578,12 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos) { struct file *file = iocb->ki_filp; + struct blk_plug plug; ssize_t ret; BUG_ON(iocb->ki_pos != pos); + blk_start_plug(&plug); ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); if (ret > 0 || ret == -EIOCBQUEUED) { ssize_t err; @@ -1590,6 +1592,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, if (err < 0 && ret > 0) ret = err; } + blk_finish_plug(&plug); return ret; } EXPORT_SYMBOL_GPL(blkdev_aio_write); |
