aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-11 20:58:20 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:35 -0400
commit5cb6c6c7eb1ed24744b41fad47d9a25b72207098 (patch)
tree14c8b8163c3491246412b0f23a4294f9fef5b222 /fs
parent867c4f9329e1bf7d0967bec761f033373f72b55e (diff)
generic_file_direct_write(): get rid of ppos argument
always equal to &iocb->ki_pos. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/file.c2
-rw-r--r--fs/fuse/file.c3
-rw-r--r--fs/ocfs2/file.c2
-rw-r--r--fs/xfs/xfs_file.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index f6032a2bfab9..8ed4b165abbd 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1640,7 +1640,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,
1640 loff_t endbyte; 1640 loff_t endbyte;
1641 int err; 1641 int err;
1642 1642
1643 written = generic_file_direct_write(iocb, iov, &nr_segs, pos, &iocb->ki_pos, 1643 written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
1644 count, ocount); 1644 count, ocount);
1645 1645
1646 if (written < 0 || written == count) 1646 if (written < 0 || written == count)
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a91d3b4d32f3..fd06d1ebc2eb 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1143,8 +1143,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
1143 goto out; 1143 goto out;
1144 1144
1145 if (file->f_flags & O_DIRECT) { 1145 if (file->f_flags & O_DIRECT) {
1146 written = generic_file_direct_write(iocb, iov, &nr_segs, 1146 written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
1147 pos, &iocb->ki_pos,
1148 count, ocount); 1147 count, ocount);
1149 if (written < 0 || written == count) 1148 if (written < 0 || written == count)
1150 goto out; 1149 goto out;
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 89099cce14fe..77b8a742866f 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2375,7 +2375,7 @@ relock:
2375 2375
2376 if (direct_io) { 2376 if (direct_io) {
2377 written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, 2377 written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,
2378 ppos, count, ocount); 2378 count, ocount);
2379 if (written < 0) { 2379 if (written < 0) {
2380 ret = written; 2380 ret = written;
2381 goto out_dio; 2381 goto out_dio;
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 175ce58fbfa3..e593554ce65e 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -699,7 +699,7 @@ xfs_file_dio_aio_write(
699 699
700 trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0); 700 trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0);
701 ret = generic_file_direct_write(iocb, iovp, 701 ret = generic_file_direct_write(iocb, iovp,
702 &nr_segs, pos, &iocb->ki_pos, count, ocount); 702 &nr_segs, pos, count, ocount);
703 703
704out: 704out:
705 xfs_rw_iunlock(ip, iolock); 705 xfs_rw_iunlock(ip, iolock);