GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 06:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic_file_direct_write(): get rid of ppos argument

Browse source 
always equal to &iocb->ki_pos.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-02-11 20:58:20 -05:00
parent 867c4f9329
commit 5cb6c6c7eb
6 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/file.c
View file

@ -1640,7 +1640,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,
loff_t endbyte; loff_t endbyte;
int err; int err;
written = generic_file_direct_write(iocb, iov, &nr_segs, pos, &iocb->ki_pos, written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
count, ocount); count, ocount);
if (written < 0 || written == count) if (written < 0 || written == count)

3
fs/fuse/file.c
View file

@ -1143,8 +1143,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
goto out; goto out;
if (file->f_flags & O_DIRECT) { if (file->f_flags & O_DIRECT) {
written = generic_file_direct_write(iocb, iov, &nr_segs, written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
pos, &iocb->ki_pos,
count, ocount); count, ocount);
if (written < 0 || written == count) if (written < 0 || written == count)
goto out; goto out;

2
fs/ocfs2/file.c
View file

@ -2375,7 +2375,7 @@ relock:
if (direct_io) { if (direct_io) {
written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos, written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,
ppos, count, ocount); count, ocount);
if (written < 0) { if (written < 0) {
ret = written; ret = written;
goto out_dio; goto out_dio;

2
fs/xfs/xfs_file.c
View file

@ -699,7 +699,7 @@ xfs_file_dio_aio_write(
trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0); trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0);
ret = generic_file_direct_write(iocb, iovp, ret = generic_file_direct_write(iocb, iovp,
&nr_segs, pos, &iocb->ki_pos, count, ocount); &nr_segs, pos, count, ocount);
out: out:
xfs_rw_iunlock(ip, iolock); xfs_rw_iunlock(ip, iolock);

2
include/linux/fs.h
View file

@ -2395,7 +2395,7 @@ extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsig
extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long); extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long);
extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t); extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *, extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
unsigned long *, loff_t, loff_t *, size_t, size_t); unsigned long *, loff_t, size_t, size_t);
extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *, extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
unsigned long, loff_t, size_t, ssize_t); unsigned long, loff_t, size_t, ssize_t);
extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos); extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);

6
mm/filemap.c
View file

@ -1985,7 +1985,7 @@ EXPORT_SYMBOL(pagecache_write_end);
ssize_t ssize_t
generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
unsigned long *nr_segs, loff_t pos, loff_t *ppos, unsigned long *nr_segs, loff_t pos,
size_t count, size_t ocount) size_t count, size_t ocount)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
@ -2046,7 +2046,7 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
i_size_write(inode, pos); i_size_write(inode, pos);
mark_inode_dirty(inode); mark_inode_dirty(inode);
} }
*ppos = pos; iocb->ki_pos = pos;
} }
out: out:
return written; return written;
@ -2265,7 +2265,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t written_buffered; ssize_t written_buffered;
written = generic_file_direct_write(iocb, iov, &nr_segs, pos, written = generic_file_direct_write(iocb, iov, &nr_segs, pos,
&iocb->ki_pos, count, ocount); count, ocount);
if (written < 0 || written == count) if (written < 0 || written == count)
goto out; goto out;
/* /*