Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cb6c6c7 authored by Al Viro's avatar Al Viro
Browse files

generic_file_direct_write(): get rid of ppos argument 



always equal to &iocb->ki_pos.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 867c4f93

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb, 
	loff_t endbyte;

	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);



	if (written < 0 || written == count)

fs/fuse/file.c

+1 −2
Original line number Diff line number Diff line
@@ -1143,8 +1143,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov, 
		goto out;



	if (file->f_flags & O_DIRECT) {

		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);

		if (written < 0 || written == count)

			goto out;

fs/ocfs2/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ relock: 


	if (direct_io) {

		written = generic_file_direct_write(iocb, iov, &nr_segs, *ppos,

						    ppos, count, ocount);

						    count, ocount);

		if (written < 0) {

			ret = written;

			goto out_dio;

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ xfs_file_dio_aio_write( 


	trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0);

	ret = generic_file_direct_write(iocb, iovp,

			&nr_segs, pos, &iocb->ki_pos, count, ocount);

			&nr_segs, pos, count, ocount);



out:

	xfs_rw_iunlock(ip, iolock);

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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, loff_t);

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 *,

		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);