summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/file.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2021-07-16 09:39:15 -0500
committerJaegeuk Kim <jaegeuk@kernel.org>2021-12-04 10:53:35 -0800
commitccf7cf92373d1a53166582013430b3b9c05a6ba2 (patch)
tree5fc0e51d3e936b335ac74c0beb2715e895f9111b /fs/f2fs/file.c
parentd4dd19ec1ea0cf6532d65709325c42b1398614a8 (diff)
downloadlinux-stable-ccf7cf92373d1a53166582013430b3b9c05a6ba2.tar.gz
linux-stable-ccf7cf92373d1a53166582013430b3b9c05a6ba2.tar.bz2
linux-stable-ccf7cf92373d1a53166582013430b3b9c05a6ba2.zip
f2fs: fix the f2fs_file_write_iter tracepoint
Pass in the original position and count rather than the position and count that were updated by the write. Also use the correct types for all arguments, in particular the file offset which was being truncated to 32 bits on 32-bit platforms. Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/file.c')
-rw-r--r--fs/f2fs/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index e1445cf915ea..048db4852b28 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4312,6 +4312,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file);
+ const loff_t orig_pos = iocb->ki_pos;
+ const size_t orig_count = iov_iter_count(from);
loff_t target_size;
int preallocated;
ssize_t ret;
@@ -4392,8 +4394,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
out_unlock:
inode_unlock(inode);
out:
- trace_f2fs_file_write_iter(inode, iocb->ki_pos,
- iov_iter_count(from), ret);
+ trace_f2fs_file_write_iter(inode, orig_pos, orig_count, ret);
if (ret > 0)
ret = generic_write_sync(iocb, ret);
return ret;