hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs_file_aio_write(): get rid of ppos 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-02-11 19:31:06 -05:00
parent fcacafd269
commit 867c4f9329
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/file.c
View File

@ -1631,7 +1631,7 @@ again:
static ssize_t __btrfs_direct_write(struct kiocb *iocb, static ssize_t __btrfs_direct_write(struct kiocb *iocb,
const struct iovec *iov, const struct iovec *iov,
unsigned long nr_segs, loff_t pos, unsigned long nr_segs, loff_t pos,
loff_t *ppos, size_t count, size_t ocount) size_t count, size_t ocount)
{ {
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct iov_iter i; struct iov_iter i;
@ -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, ppos, 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)
@ -1659,7 +1659,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb,
if (err) if (err)
goto out; goto out;
written += written_buffered; written += written_buffered;
*ppos = pos + written_buffered; iocb->ki_pos = pos + written_buffered;
invalidate_mapping_pages(file->f_mapping, pos >> PAGE_CACHE_SHIFT, invalidate_mapping_pages(file->f_mapping, pos >> PAGE_CACHE_SHIFT,
endbyte >> PAGE_CACHE_SHIFT); endbyte >> PAGE_CACHE_SHIFT);
out: out:
@ -1691,7 +1691,6 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
struct file *file = iocb->ki_filp; struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct btrfs_root *root = BTRFS_I(inode)->root; struct btrfs_root *root = BTRFS_I(inode)->root;
loff_t *ppos = &iocb->ki_pos;
u64 start_pos; u64 start_pos;
ssize_t num_written = 0; ssize_t num_written = 0;
ssize_t err = 0; ssize_t err = 0;
@ -1759,7 +1758,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
if (unlikely(file->f_flags & O_DIRECT)) { if (unlikely(file->f_flags & O_DIRECT)) {
num_written = __btrfs_direct_write(iocb, iov, nr_segs, num_written = __btrfs_direct_write(iocb, iov, nr_segs,
pos, ppos, count, ocount); pos, count, ocount);
} else { } else {
struct iov_iter i; struct iov_iter i;
@ -1767,7 +1766,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
num_written = __btrfs_buffered_write(file, &i, pos); num_written = __btrfs_buffered_write(file, &i, pos);
if (num_written > 0) if (num_written > 0)
*ppos = pos + num_written; iocb->ki_pos = pos + num_written;
} }
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);