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>

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index e1445cf915eacd88a030f1f8b56eec244dd77dc1..048db4852b2809d70bdfee725fb0a97a6e9d5bb4 100644 (file)
--- 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;

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index f8cb916f3595884811ade001360b38d255b369fd..dcb94d740e122f816ad5b90afd4f1071f3b54670 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,