NFS: Display local caching state
Display the local caching state in /proc/fs/nfsfs/volumes. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Steve Dickson <steved@redhat.com> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Tested-by: Daire Byrne <Daire.Byrne@framestore.com>
This commit is contained in:
parent
7f8e05f60c
commit
5d1acff159
@ -1564,7 +1564,7 @@ static int nfs_volume_list_show(struct seq_file *m, void *v)
|
||||
|
||||
/* display header on line 1 */
|
||||
if (v == &nfs_volume_list) {
|
||||
seq_puts(m, "NV SERVER PORT DEV FSID\n");
|
||||
seq_puts(m, "NV SERVER PORT DEV FSID FSC\n");
|
||||
return 0;
|
||||
}
|
||||
/* display one transport per line on subsequent lines */
|
||||
@ -1578,12 +1578,13 @@ static int nfs_volume_list_show(struct seq_file *m, void *v)
|
||||
(unsigned long long) server->fsid.major,
|
||||
(unsigned long long) server->fsid.minor);
|
||||
|
||||
seq_printf(m, "v%u %s %s %-7s %-17s\n",
|
||||
seq_printf(m, "v%u %s %s %-7s %-17s %s\n",
|
||||
clp->rpc_ops->version,
|
||||
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR),
|
||||
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_PORT),
|
||||
dev,
|
||||
fsid);
|
||||
fsid,
|
||||
nfs_server_fscache_state(server));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -153,6 +153,16 @@ static inline void nfs_readpage_to_fscache(struct inode *inode,
|
||||
__nfs_readpage_to_fscache(inode, page, sync);
|
||||
}
|
||||
|
||||
/*
|
||||
* indicate the client caching state as readable text
|
||||
*/
|
||||
static inline const char *nfs_server_fscache_state(struct nfs_server *server)
|
||||
{
|
||||
if (server->fscache && (server->options & NFS_OPTION_FSCACHE))
|
||||
return "yes";
|
||||
return "no ";
|
||||
}
|
||||
|
||||
|
||||
#else /* CONFIG_NFS_FSCACHE */
|
||||
static inline int nfs_fscache_register(void) { return 0; }
|
||||
@ -201,5 +211,10 @@ static inline int nfs_readpages_from_fscache(struct nfs_open_context *ctx,
|
||||
static inline void nfs_readpage_to_fscache(struct inode *inode,
|
||||
struct page *page, int sync) {}
|
||||
|
||||
static inline const char *nfs_server_fscache_state(struct nfs_server *server)
|
||||
{
|
||||
return "no ";
|
||||
}
|
||||
|
||||
#endif /* CONFIG_NFS_FSCACHE */
|
||||
#endif /* _NFS_FSCACHE_H */
|
||||
|
Loading…
Reference in New Issue
Block a user