diff options
author | Christoph Hellwig <hch@lst.de> | 2016-04-07 11:51:56 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-01 19:58:39 -0400 |
commit | 1af5bb491fbb41c8dab9d728a92758dd6a28afd4 (patch) | |
tree | 613a9e606d6c840323884e9b9edff096004719e1 /fs/btrfs/file.c | |
parent | c64fb5c7448c1a0cfa163f126df3c112b6ca3e97 (diff) |
filemap: remove the pos argument to generic_file_direct_write
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r-- | fs/btrfs/file.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 8d7b5a45c005..6c376311a9d7 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -1703,18 +1703,17 @@ again: | |||
1703 | return num_written ? num_written : ret; | 1703 | return num_written ? num_written : ret; |
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | static ssize_t __btrfs_direct_write(struct kiocb *iocb, | 1706 | static ssize_t __btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) |
1707 | struct iov_iter *from, | ||
1708 | loff_t pos) | ||
1709 | { | 1707 | { |
1710 | struct file *file = iocb->ki_filp; | 1708 | struct file *file = iocb->ki_filp; |
1711 | struct inode *inode = file_inode(file); | 1709 | struct inode *inode = file_inode(file); |
1710 | loff_t pos = iocb->ki_pos; | ||
1712 | ssize_t written; | 1711 | ssize_t written; |
1713 | ssize_t written_buffered; | 1712 | ssize_t written_buffered; |
1714 | loff_t endbyte; | 1713 | loff_t endbyte; |
1715 | int err; | 1714 | int err; |
1716 | 1715 | ||
1717 | written = generic_file_direct_write(iocb, from, pos); | 1716 | written = generic_file_direct_write(iocb, from); |
1718 | 1717 | ||
1719 | if (written < 0 || !iov_iter_count(from)) | 1718 | if (written < 0 || !iov_iter_count(from)) |
1720 | return written; | 1719 | return written; |
@@ -1832,7 +1831,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, | |||
1832 | atomic_inc(&BTRFS_I(inode)->sync_writers); | 1831 | atomic_inc(&BTRFS_I(inode)->sync_writers); |
1833 | 1832 | ||
1834 | if (iocb->ki_flags & IOCB_DIRECT) { | 1833 | if (iocb->ki_flags & IOCB_DIRECT) { |
1835 | num_written = __btrfs_direct_write(iocb, from, pos); | 1834 | num_written = __btrfs_direct_write(iocb, from); |
1836 | } else { | 1835 | } else { |
1837 | num_written = __btrfs_buffered_write(file, from, pos); | 1836 | num_written = __btrfs_buffered_write(file, from, pos); |
1838 | if (num_written > 0) | 1837 | if (num_written > 0) |