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/ext2 | |
parent | 256249584bda1a9357e2d29987a37f5b2df035f6 (diff) | |
download | kernel_samsung_tuna-eafdc7d190a944c755a9fe68573c193e6e0217e7.zip kernel_samsung_tuna-eafdc7d190a944c755a9fe68573c193e6e0217e7.tar.gz kernel_samsung_tuna-eafdc7d190a944c755a9fe68573c193e6e0217e7.tar.bz2 |
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/ext2')
-rw-r--r-- | fs/ext2/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 3675088..f36e967 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -838,7 +838,7 @@ ext2_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, struct inode *inode = mapping->host; ssize_t ret; - ret = blockdev_direct_IO_newtrunc(rw, iocb, inode, inode->i_sb->s_bdev, + ret = blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, offset, nr_segs, ext2_get_block, NULL); if (ret < 0 && (rw & WRITE)) ext2_write_failed(mapping, offset + iov_length(iov, nr_segs)); |