xfs: fix dev_t usage in xmbuf tracepoints
PATCH 1/1 xfs: fix dev_t usage in xmbuf tracepoints
From: Darrick J. Wong <[email protected]>
Fix some inconsistencies in the xmbuf tracepoints -- they should be reporting the major/minor of the filesystem that they're associated with, so that we have some clue on whose behalf the xmbuf was created. Fix the xmbuf_free tracepoint to report the same.
Don't call the trace function until the xmbuf is fully initialized.
--- fs/xfs/xfs_buf_mem.c | 4 ++-- fs/xfs/xfs_trace.h | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-)
fs/xfs/xfs_buf_mem.c +2 -2
@@ -81,8 +81,6 @@ xmbuf_alloc(/* ensure all writes are below EOF to avoid pagecache zeroing */ i_size_write (inode, inode->i_sb->s_maxbytes); -trace_xmbuf_create (btp); - error =xfs_buf_cache_init (btp->bt_cache);if (error) goto out_file;
@@ -99,6 +97,8 @@ xmbuf_alloc(if (error) goto out_bcache; +trace_xmbuf_create (btp); + *btpp = btp;return 0 ;
fs/xfs/xfs_trace.h +7 -2
@@ -4651,6 +4651,7 @@ TRACE_EVENT(xmbuf_create,char *path;struct file *file = btp->bt_file; + __entry->dev = btp->bt_mount->m_super->s_dev; __entry->ino =file_inode (file)->i_ino;memset (pathname,0 ,sizeof (pathname)); path =file_path (file, pathname,sizeof (pathname) -1 );
@@ -4658,7 +4659,8 @@ TRACE_EVENT(xmbuf_create, path ="(unknown)" ;strncpy (__entry->pathname, path,sizeof (__entry->pathname)); ), -TP_printk ("xmino 0x%lx path '%s'" , +TP_printk ("dev %d:%d xmino 0x%lx path '%s'" , +MAJOR (__entry->dev),MINOR (__entry->dev), __entry->ino, __entry->pathname) );
@@ -4667,6 +4669,7 @@ TRACE_EVENT(xmbuf_free, TP_PROTO(struct xfs_buftarg *btp), TP_ARGS(btp), TP_STRUCT__entry( + __field(dev_t, dev) __field(unsigned long, ino) __field(unsigned long long, bytes) __field(loff_t, size)
@@ -4675,11 +4678,13 @@ TRACE_EVENT(xmbuf_free,struct file *file = btp->bt_file;struct inode *inode =file_inode (file); + __entry->dev = btp->bt_mount->m_super->s_dev; __entry->size =i_size_read (inode); __entry->bytes = (inode->i_blocks <<SECTOR_SHIFT ) + inode->i_bytes; __entry->ino = inode->i_ino; ), -TP_printk ("xmino 0x%lx mem_bytes 0x%llx isize 0x%llx" , +TP_printk ("dev %d:%d xmino 0x%lx mem_bytes 0x%llx isize 0x%llx" , +MAJOR (__entry->dev),MINOR (__entry->dev), __entry->ino, __entry->bytes, __entry->size)
Quoted 8 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Fix some inconsistencies in the xmbuf tracepoints -- they should be reporting the major/minor of the filesystem that they're associated with, so that we have some clue on whose behalf the xmbuf was created. Fix the
xmbuf_freetracepoint to report the same.Don't call the trace function until the xmbuf is fully initialized.
Looks good: