Commit 256093fe authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Improve tracing of nfs_wb_folio() 



Include info about which folio is being traced.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent eb5654b3

fs/nfs/nfstrace.h

+3 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ DEFINE_NFS_INODE_EVENT(nfs_getattr_enter); 
DEFINE_NFS_INODE_EVENT_DONE(nfs_getattr_exit);

DEFINE_NFS_INODE_EVENT(nfs_setattr_enter);

DEFINE_NFS_INODE_EVENT_DONE(nfs_setattr_exit);

DEFINE_NFS_INODE_EVENT(nfs_writeback_page_enter);

DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_page_exit);

DEFINE_NFS_INODE_EVENT(nfs_writeback_inode_enter);

DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_inode_exit);

DEFINE_NFS_INODE_EVENT(nfs_fsync_enter);
@@ -1032,6 +1030,9 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done, 
DEFINE_NFS_FOLIO_EVENT(nfs_aop_readpage);

DEFINE_NFS_FOLIO_EVENT_DONE(nfs_aop_readpage_done);



DEFINE_NFS_FOLIO_EVENT(nfs_writeback_folio);

DEFINE_NFS_FOLIO_EVENT_DONE(nfs_writeback_folio_done);



DEFINE_NFS_FOLIO_EVENT(nfs_invalidate_folio);

DEFINE_NFS_FOLIO_EVENT_DONE(nfs_launder_folio_done);

fs/nfs/write.c

+2 −2
Original line number Diff line number Diff line
@@ -2093,7 +2093,7 @@ int nfs_wb_folio(struct inode *inode, struct folio *folio) 
	};

	int ret;



	trace_nfs_writeback_page_enter(inode);

	trace_nfs_writeback_folio(inode, folio);



	for (;;) {

		folio_wait_writeback(folio);
@@ -2111,7 +2111,7 @@ int nfs_wb_folio(struct inode *inode, struct folio *folio) 
			goto out_error;

	}

out_error:

	trace_nfs_writeback_page_exit(inode, ret);

	trace_nfs_writeback_folio_done(inode, folio, ret);

	return ret;

}