From: Darrick J. Wong <djwong@xxxxxxxxxx>
Change the class of the fallocate tracepoints to capture the offset and
length of the requested operation.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
fs/xfs/xfs_bmap_util.c | 8 ++++----
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_trace.h | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index a3b987fafcce6..72abd62d40607 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -826,7 +826,7 @@ xfs_alloc_file_space(
xfs_bmbt_irec_t imaps[1], *imapp;
int error;
- trace_xfs_alloc_file_space(ip);
+ trace_xfs_alloc_file_space(ip, offset, len);
if (xfs_is_shutdown(mp))
return -EIO;
@@ -1014,7 +1014,7 @@ xfs_free_file_space(
xfs_fileoff_t endoffset_fsb;
int done = 0, error;
- trace_xfs_free_file_space(ip);
+ trace_xfs_free_file_space(ip, offset, len);
error = xfs_qm_dqattach(ip);
if (error)
@@ -1152,7 +1152,7 @@ xfs_collapse_file_space(
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
- trace_xfs_collapse_file_space(ip);
+ trace_xfs_collapse_file_space(ip, offset, len);
error = xfs_free_file_space(ip, offset, len);
if (error)
@@ -1222,7 +1222,7 @@ xfs_insert_file_space(
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
- trace_xfs_insert_file_space(ip);
+ trace_xfs_insert_file_space(ip, offset, len);
error = xfs_bmap_can_insert_extents(ip, stop_fsb, shift_fsb);
if (error)
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index f2dd4daaa4e24..36ccec461e2a4 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1150,7 +1150,7 @@ xfs_file_fallocate(
*/
unsigned int blksize = i_blocksize(inode);
- trace_xfs_zero_file_space(ip);
+ trace_xfs_zero_file_space(ip, offset, len);
/* Unshare around the region to zero, if needed. */
if (xfs_file_write_needs_cow_around(ip, offset, len)) {
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 9ea65cd65d4af..7b3abcabbafb6 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -831,11 +831,6 @@ DEFINE_INODE_EVENT(xfs_getattr);
DEFINE_INODE_EVENT(xfs_setattr);
DEFINE_INODE_EVENT(xfs_readlink);
DEFINE_INODE_EVENT(xfs_inactive_symlink);
-DEFINE_INODE_EVENT(xfs_alloc_file_space);
-DEFINE_INODE_EVENT(xfs_free_file_space);
-DEFINE_INODE_EVENT(xfs_zero_file_space);
-DEFINE_INODE_EVENT(xfs_collapse_file_space);
-DEFINE_INODE_EVENT(xfs_insert_file_space);
DEFINE_INODE_EVENT(xfs_readdir);
#ifdef CONFIG_XFS_POSIX_ACL
DEFINE_INODE_EVENT(xfs_get_acl);
@@ -1629,6 +1624,11 @@ DEFINE_SIMPLE_IO_EVENT(xfs_end_io_direct_write);
DEFINE_SIMPLE_IO_EVENT(xfs_end_io_direct_write_unwritten);
DEFINE_SIMPLE_IO_EVENT(xfs_end_io_direct_write_append);
DEFINE_SIMPLE_IO_EVENT(xfs_file_splice_read);
+DEFINE_SIMPLE_IO_EVENT(xfs_alloc_file_space);
+DEFINE_SIMPLE_IO_EVENT(xfs_free_file_space);
+DEFINE_SIMPLE_IO_EVENT(xfs_zero_file_space);
+DEFINE_SIMPLE_IO_EVENT(xfs_collapse_file_space);
+DEFINE_SIMPLE_IO_EVENT(xfs_insert_file_space);
DECLARE_EVENT_CLASS(xfs_itrunc_class,
TP_PROTO(struct xfs_inode *ip, xfs_fsize_t new_size),
