NFSv4.2: Move TRACE_DEFINE_ENUM(NFS4_CONTENT_*) under CONFIG_NFS_V4_2
Subsystems (2)
Anna Schumaker
maintainerPATCH 1/3 NFSv4.2: Move TRACE_DEFINE_ENUM(NFS4_CONTENT_*) under CONFIG_NFS_V4_2
From: Anna Schumaker <[email protected]>
NFS4_CONTENT_DATA and NFS4_CONTENT_HOLE both only exist under NFS v4.2. Move their corresponding TRACE_DEFINE_ENUM calls under this Kconfig option.
--- fs/nfs/nfs4trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4trace.h +1 -1
@@ -2097,6 +2097,7 @@ TRACE_EVENT(ff_layout_commit_error, ) ); +#ifdef CONFIG_NFS_V4_2 TRACE_DEFINE_ENUM (NFS4_CONTENT_DATA );TRACE_DEFINE_ENUM (NFS4_CONTENT_HOLE );
@@ -2105,7 +2106,6 @@ TRACE_DEFINE_ENUM(NFS4_CONTENT_HOLE); { NFS4_CONTENT_DATA, "DATA" }, \ { NFS4_CONTENT_HOLE, "HOLE" }) -#ifdef CONFIG_NFS_V4_2 TRACE_EVENT(nfs4_llseek, TP_PROTO( const struct inode *inode,
Signature · 1 line
2.37.3
Anna Schumaker
maintainerPATCH 2/3 NFSv4.2: Add tracepoints for getxattr, setxattr, and removexattr
From: Anna Schumaker <[email protected]>
These functions take similar arguments, and can share a tracepoint class for common formatting.
--- fs/nfs/nfs42proc.c | 3 +++ fs/nfs/nfs4trace.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
fs/nfs/nfs42proc.c +3 -0
@@ -1175,6 +1175,7 @@ static int _nfs42_proc_removexattr(struct inode *inode, const char *name) ret =nfs4_call_sync (server->client, server, &msg, &args.seq_args, &res.seq_res,1 ); +trace_nfs4_removexattr (inode, name, ret);if (!ret)nfs4_update_changeattr (inode, &res.cinfo, timestamp,0 );
@@ -1214,6 +1215,7 @@ static int _nfs42_proc_setxattr(struct inode *inode, const char *name, ret =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,1 ); +trace_nfs4_setxattr (inode, name, ret);for (; np >0 ; np--)put_page (pages[np -1 ]);
@@ -1246,6 +1248,7 @@ static ssize_t _nfs42_proc_getxattr(struct inode *inode, const char *name, ret =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,0 ); +trace_nfs4_getxattr (inode, name, ret);if (ret <0 )return ret;
fs/nfs/nfs4trace.h +46 -0
52 lines not on this page · raw message
Signature · 1 line
2.37.3
Anna Schumaker
maintainerPATCH 3/3 NFSv4.2: Add a tracepoint for listxattr
In reply to Anna SchumakerFrom: Anna Schumaker <[email protected]>
This can be defined as simply an NFS4_INODE_EVENT() since we don't have the name of a specific xattr to list. This roughly matches readdir, which also uses an NFS4_INODE_EVENT() tracepoint.
--- fs/nfs/nfs42proc.c | 1 + fs/nfs/nfs4trace.h | 2 ++ 2 files changed, 3 insertions(+)
fs/nfs/nfs42proc.c +1 -0
@@ -1320,6 +1320,7 @@ static ssize_t _nfs42_proc_listxattrs(struct inode *inode, void *buf, ret =nfs4_call_sync (server->client, server, &msg, &arg.seq_args, &res.seq_res,0 ); +trace_nfs4_listxattr (inode, ret);if (ret >=0 ) { ret = res.copied;
fs/nfs/nfs4trace.h +2 -0
@@ -2542,6 +2542,8 @@ DECLARE_EVENT_CLASS(nfs4_xattr_event,DEFINE_NFS4_XATTR_EVENT (nfs4_getxattr);DEFINE_NFS4_XATTR_EVENT (nfs4_setxattr);DEFINE_NFS4_XATTR_EVENT (nfs4_removexattr); + +DEFINE_NFS4_INODE_EVENT (nfs4_listxattr);#endif /* CONFIG_NFS_V4_2 */ #endif /* CONFIG_NFS_V4_1 */
Signature · 1 line
2.37.3