f2fs: fix the f2fs_file_write_iter tracepoint

[ Upstream commit ccf7cf92373d1a53166582013430b3b9c05a6ba2 ]

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>
Stable-dep-of: bb34cc6ca87f ("f2fs: fix to update iostat correctly in f2fs_filemap_fault()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 533ab259ce0193d20298067e9539ac22ced5d334..d220c4523982111dde1cde7774b084be74eee193 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -4255,6 +4255,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);
        ssize_t ret;
 
        if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) {
@@ -4358,8 +4360,7 @@ write:
 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;

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index f5dcf7c9b707605e8dbca7aab9a5069071fb42d8..6033eaddcb7491f1404b24dda7a3b532457dc992 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -540,17 +540,17 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
 
 TRACE_EVENT(f2fs_file_write_iter,
 
-       TP_PROTO(struct inode *inode, unsigned long offset,
-               unsigned long length, int ret),
+       TP_PROTO(struct inode *inode, loff_t offset, size_t length,
+                ssize_t ret),
 
        TP_ARGS(inode, offset, length, ret),
 
        TP_STRUCT__entry(
                __field(dev_t,  dev)
                __field(ino_t,  ino)
-               __field(unsigned long, offset)
-               __field(unsigned long, length)
-               __field(int,    ret)
+               __field(loff_t, offset)
+               __field(size_t, length)
+               __field(ssize_t, ret)
        ),
 
        TP_fast_assign(
@@ -562,7 +562,7 @@ TRACE_EVENT(f2fs_file_write_iter,
        ),
 
        TP_printk("dev = (%d,%d), ino = %lu, "
-               "offset = %lu, length = %lu, written(err) = %d",
+               "offset = %lld, length = %zu, written(err) = %zd",
                show_dev_ino(__entry),
                __entry->offset,
                __entry->length,