2021-10-07 22:34:17

by David Wysochanski

[permalink] [raw]
Subject: [PATCH v2 3/7] NFS: Convert NFS fscache enable/disable dfprintks to tracepoints

Convert the enable / disable NFS fscache dfprintks to tracepoints.
Utilize the existing NFS inode trace event class, which allows us
to keep the same output format to other NFS inode tracepoints.
Start the names of the tracepoints with "nfs_fscache" for easy
identification.

Signed-off-by: Dave Wysochanski <[email protected]>
---
fs/nfs/fscache.c | 5 +++--
fs/nfs/nfstrace.h | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
index 6764938eca2d..5f9be4a1b5f8 100644
--- a/fs/nfs/fscache.c
+++ b/fs/nfs/fscache.c
@@ -19,6 +19,7 @@
#include "internal.h"
#include "iostat.h"
#include "fscache.h"
+#include "nfstrace.h"

#define NFSDBG_FACILITY NFSDBG_FSCACHE

@@ -314,11 +315,11 @@ void nfs_fscache_open_file(struct inode *inode, struct file *filp)
nfs_fscache_update_auxdata(&auxdata, inode);

if (inode_is_open_for_write(inode)) {
- dfprintk(FSCACHE, "NFS: nfsi 0x%p disabling cache\n", nfsi);
+ trace_nfs_fscache_disable_inode(inode);
clear_bit(NFS_INO_FSCACHE, &nfsi->flags);
fscache_disable_cookie(cookie, &auxdata, true);
} else {
- dfprintk(FSCACHE, "NFS: nfsi 0x%p enabling cache\n", nfsi);
+ trace_nfs_fscache_enable_inode(inode);
fscache_enable_cookie(cookie, &auxdata, i_size_read(inode),
nfs_fscache_can_enable, inode);
if (fscache_cookie_enabled(cookie))
diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 8a224871be74..b79f5fe2e39d 100644
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -209,6 +209,8 @@
DEFINE_NFS_INODE_EVENT(nfs_fsync_enter);
DEFINE_NFS_INODE_EVENT_DONE(nfs_fsync_exit);
DEFINE_NFS_INODE_EVENT(nfs_access_enter);
+DEFINE_NFS_INODE_EVENT(nfs_fscache_enable_inode);
+DEFINE_NFS_INODE_EVENT(nfs_fscache_disable_inode);

TRACE_EVENT(nfs_access_exit,
TP_PROTO(
--
1.8.3.1