korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 14:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

f2fs: fix the f2fs_file_write_iter tracepoint

Browse Source 
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>
This commit is contained in:
Eric Biggers 2021-07-16 09:39:15 -05:00 committed by Jaegeuk Kim
parent d4dd19ec1e
commit ccf7cf9237
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/f2fs/file.c
View File

@ -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 file *file = iocb->ki_filp;
struct inode *inode = file_inode(file); 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; loff_t target_size;
int preallocated; int preallocated;
ssize_t ret; ssize_t ret;
@ -4392,8 +4394,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
out_unlock: out_unlock:
inode_unlock(inode); inode_unlock(inode);
out: out:
trace_f2fs_file_write_iter(inode, iocb->ki_pos, trace_f2fs_file_write_iter(inode, orig_pos, orig_count, ret);
iov_iter_count(from), ret);
if (ret > 0) if (ret > 0)
ret = generic_write_sync(iocb, ret); ret = generic_write_sync(iocb, ret);
return ret; return ret;

12
include/trace/events/f2fs.h
View File

@ -540,17 +540,17 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
TRACE_EVENT(f2fs_file_write_iter, TRACE_EVENT(f2fs_file_write_iter,
TP_PROTO(struct inode *inode, unsigned long offset, TP_PROTO(struct inode *inode, loff_t offset, size_t length,
unsigned long length, int ret), ssize_t ret),
TP_ARGS(inode, offset, length, ret), TP_ARGS(inode, offset, length, ret),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(ino_t, ino) __field(ino_t, ino)
__field(unsigned long, offset) __field(loff_t, offset)
__field(unsigned long, length) __field(size_t, length)
__field(int, ret) __field(ssize_t, ret)
), ),
TP_fast_assign( TP_fast_assign(
@ -562,7 +562,7 @@ TRACE_EVENT(f2fs_file_write_iter,
), ),
TP_printk("dev = (%d,%d), ino = %lu, " 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), show_dev_ino(__entry),
__entry->offset, __entry->offset,
__entry->length, __entry->length,