From: Dave Wysochanski <dwysocha@redhat.com>
To: Trond Myklebust <trondmy@hammerspace.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
David Howells <dhowells@redhat.com>
Cc: linux-cachefs@redhat.com, linux-nfs@vger.kernel.org
Subject: [PATCH v1 4/7] NFS: Convert NFS fscache enable/disable dfprintks to tracepoints
Date: Sun, 3 Oct 2021 15:22:35 -0400 [thread overview]
Message-ID: <1633288958-8481-5-git-send-email-dwysocha@redhat.com> (raw)
In-Reply-To: <1633288958-8481-1-git-send-email-dwysocha@redhat.com>
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.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
---
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 8f17fda5b8c9..a2b517846787 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_disable_fscache_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_enable_fscache_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..b4177f57f69b 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_enable_fscache_inode);
+DEFINE_NFS_INODE_EVENT(nfs_disable_fscache_inode);
TRACE_EVENT(nfs_access_exit,
TP_PROTO(
--
1.8.3.1
next prev parent reply other threads:[~2021-10-03 19:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-03 19:22 [PATCH v1 0/7] Various NFS fscache cleanups Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 1/7] NFS: Fixup patch 3/8 of fscache-iter-3 v2 Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 2/7] NFS: Use nfs_i_fscache() consistently within NFS fscache code Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 3/7] NFS: Cleanup usage of nfs_inode in fscache interface and handle i_size properly Dave Wysochanski
2021-10-03 19:22 ` Dave Wysochanski [this message]
2021-10-03 19:22 ` [PATCH v1 5/7] NFS: Replace dfprintks in favor of tracepoints in fscache IO paths Dave Wysochanski
2021-10-07 13:41 ` [Linux-cachefs] " David Wysochanski
2021-10-03 19:22 ` [PATCH v1 6/7] NFS: Remove remaining dfprintks related to fscache cookies Dave Wysochanski
2021-10-03 19:22 ` [PATCH v1 7/7] NFS: Remove remaining usages of NFSDBG_FSCACHE Dave Wysochanski
2021-10-04 15:57 ` Trond Myklebust
2021-10-05 13:51 ` David Wysochanski
2021-10-05 9:52 ` [PATCH v1 0/7] Various NFS fscache cleanups David Howells
2021-10-05 12:31 ` David Howells
2021-10-05 12:52 ` [PATCH v1 1/7] NFS: Fixup patch 3/8 of fscache-iter-3 v2 David Howells
2021-10-05 13:23 ` David Wysochanski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1633288958-8481-5-git-send-email-dwysocha@redhat.com \
--to=dwysocha@redhat.com \
--cc=anna.schumaker@netapp.com \
--cc=dhowells@redhat.com \
--cc=linux-cachefs@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trondmy@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).