diff options
| author | Christoph Hellwig <hch@lst.de> | 2010-06-04 11:29:53 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-08-09 16:47:29 -0400 |
| commit | eafdc7d190a944c755a9fe68573c193e6e0217e7 (patch) | |
| tree | 915c3cc8004706fabf88eae1ab123a3fa0147516 /fs/block_dev.c | |
| parent | 256249584bda1a9357e2d29987a37f5b2df035f6 (diff) | |
| download | linux-3.10-eafdc7d190a944c755a9fe68573c193e6e0217e7.tar.gz linux-3.10-eafdc7d190a944c755a9fe68573c193e6e0217e7.tar.bz2 linux-3.10-eafdc7d190a944c755a9fe68573c193e6e0217e7.zip | |
sort out blockdev_direct_IO variants
Move the call to vmtruncate to get rid of accessive blocks to the callers
in prepearation of the new truncate calling sequence. This was only done
for DIO_LOCKING filesystems, so the __blockdev_direct_IO_newtrunc variant
was not needed anyway. Get rid of blockdev_direct_IO_no_locking and
its _newtrunc variant while at it as just opencoding the two additional
paramters is shorted than the name suffix.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 99d6af81174..65a0c26508e 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -172,9 +172,8 @@ blkdev_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, struct file *file = iocb->ki_filp; struct inode *inode = file->f_mapping->host; - return blockdev_direct_IO_no_locking_newtrunc(rw, iocb, inode, - I_BDEV(inode), iov, offset, nr_segs, - blkdev_get_blocks, NULL); + return __blockdev_direct_IO(rw, iocb, inode, I_BDEV(inode), iov, offset, + nr_segs, blkdev_get_blocks, NULL, NULL, 0); } int __sync_blockdev(struct block_device *bdev, int wait) |