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

kill the 5th argument of generic_file_buffered_write()

Browse source 
same story - it's &iocb->ki_pos in all cases

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-02-09 13:37:49 -05:00
parent 41fc56d573
commit fcacafd269
5 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/ceph/file.c
View file

@ -978,8 +978,7 @@ retry_snap:
* can not run at the same time * can not run at the same time
*/ */
written = generic_file_buffered_write(iocb, iov, nr_segs, written = generic_file_buffered_write(iocb, iov, nr_segs,
pos, &iocb->ki_pos, pos, count, 0);
count, 0);
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
} }

2
fs/ocfs2/file.c
View file

@ -2383,7 +2383,7 @@ relock:
} else { } else {
current->backing_dev_info = file->f_mapping->backing_dev_info; current->backing_dev_info = file->f_mapping->backing_dev_info;
written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos, written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos,
ppos, count, 0); count, 0);
current->backing_dev_info = NULL; current->backing_dev_info = NULL;
} }

2
fs/xfs/xfs_file.c
View file

@ -738,7 +738,7 @@ xfs_file_buffered_aio_write(
write_retry: write_retry:
trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, 0); trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, 0);
ret = generic_file_buffered_write(iocb, iovp, nr_segs, ret = generic_file_buffered_write(iocb, iovp, nr_segs,
pos, &iocb->ki_pos, count, 0); pos, count, 0);
/* /*
* If we just got an ENOSPC, try to write back all dirty inodes to * If we just got an ENOSPC, try to write back all dirty inodes to

2
include/linux/fs.h
View file

@ -2397,7 +2397,7 @@ extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsi
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, 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, 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);
extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos); extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
extern int generic_segment_checks(const struct iovec *iov, extern int generic_segment_checks(const struct iovec *iov,

9
mm/filemap.c
View file

@ -2183,7 +2183,7 @@ again:
ssize_t ssize_t
generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov, generic_file_buffered_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, ssize_t written) size_t count, ssize_t written)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
@ -2195,7 +2195,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
if (likely(status >= 0)) { if (likely(status >= 0)) {
written += status; written += status;
*ppos = pos + status; iocb->ki_pos = pos + status;
} }
return written ? written : status; return written ? written : status;
@ -2275,8 +2275,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
pos += written; pos += written;
count -= written; count -= written;
written_buffered = generic_file_buffered_write(iocb, iov, written_buffered = generic_file_buffered_write(iocb, iov,
nr_segs, pos, &iocb->ki_pos, count, nr_segs, pos, count, written);
written);
/* /*
* If generic_file_buffered_write() retuned a synchronous error * If generic_file_buffered_write() retuned a synchronous error
* then we want to return the number of bytes which were * then we want to return the number of bytes which were
@ -2309,7 +2308,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
} }
} else { } else {
written = generic_file_buffered_write(iocb, iov, nr_segs, written = generic_file_buffered_write(iocb, iov, nr_segs,
pos, &iocb->ki_pos, count, written); pos, count, written);
} }
out: out:
current->backing_dev_info = NULL; current->backing_dev_info = NULL;