nfsd4: add filename to states output
Subsystems (2)
PATCH v3 1/1 nfsd4: add filename to states output
Add filename to states output for ease of debugging.
Signed-off-by Achilles Gaikwad <[email protected]>
Signed-off-by Kenneth Dsouza <[email protected]>
--- fs/nfsd/nfs4state.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/nfsd/nfs4state.c +13 -0
@@ -2404,6 +2404,11 @@ static void states_stop(struct seq_file *s, void *v)spin_unlock (&clp->cl_lock); } +static void nfs4_show_fname (struct seq_file *s,struct nfsd_file *f) +{ +seq_printf (s,"filename: \"%pD2\"" , f->nf_file); +} +static void nfs4_show_superblock (struct seq_file *s,struct nfsd_file *f) {struct inode *inode = f->nf_inode;
@@ -2449,6 +2454,8 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)nfs4_show_superblock (s, file);seq_printf (s,", " ); +nfs4_show_fname (s, file); +seq_printf (s,", " );nfs4_show_owner (s, oo);seq_printf (s," }\n" );nfsd_file_put (file);
@@ -2480,6 +2487,8 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st)nfs4_show_superblock (s, file);/* XXX: open stateid? */ seq_printf (s,", " ); +nfs4_show_fname (s, file); +seq_printf (s,", " );nfs4_show_owner (s, oo);seq_printf (s," }\n" );nfsd_file_put (file);
@@ -2506,6 +2515,8 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)/* XXX: lease time, whether it's being recalled. */ nfs4_show_superblock (s, file); +seq_printf (s,", " ); +nfs4_show_fname (s, file);seq_printf (s," }\n" );return 0 ;
@@ -2524,6 +2535,8 @@ static int nfs4_show_layout(struct seq_file *s, struct nfs4_stid *st)/* XXX: What else would be useful? */ nfs4_show_superblock (s, file); +seq_printf (s,", " ); +nfs4_show_fname (s, file);seq_printf (s," }\n" );return 0 ;
Signature · 1 line
2.25.3
Quoted 1 line · Achilles Gaikwad
Add filename to states output for ease of debugging.
Thanks!
The results may be surprising for disconnected dentries. E.g., start a "tail -f" on a file on an NFS export, then reboot the server and give the client a chance to recover, and then look at /proc/fs/nfsd/clients, and you'll just see
filename: "/"
But, I suppose it's still nice to print the pathname when it's available. The one improvement I can think of is to print something like "<disconnected>" in that case. I'm not sure where that logic would go.
--b.
Quoted 61 lines
Signed-off-by Achilles Gaikwad <[email protected]>Signed-off-by Kenneth Dsouza <[email protected]>--- fs/nfsd/nfs4state.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)fs/nfsd/nfs4state.c +13
-0@@ -2404,6 +2404,11 @@ static void states_stop(struct seq_file *s, void *v)spin_unlock (&clp->cl_lock); } +static void nfs4_show_fname (struct seq_file *s,struct nfsd_file *f) +{ +seq_printf (s,"filename: \"%pD2\"" , f->nf_file); +} +static void nfs4_show_superblock (struct seq_file *s,struct nfsd_file *f) {struct inode *inode = f->nf_inode;@@ -2449,6 +2454,8 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)nfs4_show_superblock (s, file);seq_printf (s,", " ); +nfs4_show_fname (s, file); +seq_printf (s,", " );nfs4_show_owner (s, oo);seq_printf (s," }\n" );nfsd_file_put (file);@@ -2480,6 +2487,8 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st)nfs4_show_superblock (s, file);/* XXX: open stateid? */ seq_printf (s,", " ); +nfs4_show_fname (s, file); +seq_printf (s,", " );nfs4_show_owner (s, oo);seq_printf (s," }\n" );nfsd_file_put (file);@@ -2506,6 +2515,8 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)/* XXX: lease time, whether it's being recalled. */ nfs4_show_superblock (s, file); +seq_printf (s,", " ); +nfs4_show_fname (s, file);seq_printf (s," }\n" );return 0 ;@@ -2524,6 +2535,8 @@ static int nfs4_show_layout(struct seq_file *s, struct nfs4_stid *st)/* XXX: What else would be useful? */ nfs4_show_superblock (s, file); +seq_printf (s,", " ); +nfs4_show_fname (s, file);seq_printf (s," }\n" );return 0 ;Signature · 1 line
2.25.3