From: David Howells <dhowells@redhat.com>
To: Trond.Myklebust@netapp.com
Cc: nfsv4@linux-nfs.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org, selinux@tycho.nsa.gov,
linux-security-module@vger.kernel.org, dhowells@redhat.com
Subject: [PATCH 26/27] NFS: Display local caching state
Date: Wed, 23 Jan 2008 00:46:03 +0000 [thread overview]
Message-ID: <20080123004603.15602.71030.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20080123004344.15602.35710.stgit@warthog.procyon.org.uk>
Display the local caching state in /proc/fs/nfsfs/volumes.
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/nfs/client.c | 7 ++++---
fs/nfs/fscache.h | 15 +++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 92f9b84..68d3124 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1335,7 +1335,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 */
@@ -1349,12 +1349,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%d %02x%02x%02x%02x %4hx %-7s %-17s\n",
+ seq_printf(m, "v%d %02x%02x%02x%02x %4hx %-7s %-17s %s\n",
clp->cl_nfsversion,
NIPQUAD(clp->cl_addr.sin_addr),
ntohs(clp->cl_addr.sin_port),
dev,
- fsid);
+ fsid,
+ nfs_server_fscache_state(server));
return 0;
}
diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index 144fb58..9a735fc 100644
--- a/fs/nfs/fscache.h
+++ b/fs/nfs/fscache.h
@@ -53,6 +53,17 @@ extern void __nfs_fscache_invalidate_page(struct page *, struct inode *);
extern int nfs_fscache_release_page(struct page *, gfp_t);
/*
+ * indicate the client caching state as readable text
+ */
+static inline const char *nfs_server_fscache_state(struct nfs_server *server)
+{
+ if (server->nfs_client->fscache &&
+ (server->options & NFS_OPTION_FSCACHE))
+ return "yes";
+ return "no ";
+}
+
+/*
* release the caching state associated with a page if undergoing complete page
* invalidation
*/
@@ -109,6 +120,10 @@ static inline void nfs4_fscache_get_client_cookie(struct nfs_client *clp) {}
static inline void nfs_fscache_release_client_cookie(struct nfs_client *clp) {}
static inline void nfs_fscache_show_stats(struct seq_file *m,
struct nfs_server *nfss) {}
+static inline const char *nfs_server_fscache_state(struct nfs_server *server)
+{
+ return "no ";
+}
static inline void nfs_fscache_init_fh_cookie(struct inode *inode) {}
static inline void nfs_fscache_enable_fh_cookie(struct inode *inode) {}
next prev parent reply other threads:[~2008-01-23 0:56 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-23 0:43 [PATCH 00/27] Permit filesystem local caching David Howells
2008-01-23 0:43 ` [PATCH 01/27] KEYS: Increase the payload size when instantiating a key David Howells
2008-01-23 0:43 ` [PATCH 02/27] KEYS: Check starting keyring as part of search David Howells
2008-01-23 0:44 ` [PATCH 03/27] KEYS: Allow the callout data to be passed as a blob rather than a string David Howells
2008-01-23 0:44 ` [PATCH 04/27] KEYS: Add keyctl function to get a security label David Howells
2008-01-23 0:44 ` [PATCH 05/27] Security: Change current->fs[ug]id to current_fs[ug]id() David Howells
2008-01-23 0:44 ` [PATCH 06/27] Security: Separate task security context from task_struct David Howells
2008-01-23 0:44 ` [PATCH 07/27] Security: De-embed task security record from task and use refcounting David Howells
2008-01-23 0:44 ` [PATCH 08/27] Add a secctx_to_secid() LSM hook to go along with the existing David Howells
2008-01-23 0:44 ` [PATCH 09/27] Security: Pre-add additional non-caching classes David Howells
2008-01-23 0:44 ` [PATCH 10/27] Security: Add a kernel_service object class to SELinux David Howells
2008-01-23 0:44 ` [PATCH 11/27] Security: Allow kernel services to override LSM settings for task actions David Howells
2008-01-23 0:44 ` [PATCH 12/27] Security: Make NFSD work with detached security David Howells
2008-01-23 0:44 ` [PATCH 13/27] FS-Cache: Release page->private after failed readahead David Howells
2008-01-23 0:45 ` [PATCH 14/27] FS-Cache: Recruit a couple of page flags for cache management David Howells
2008-01-23 0:45 ` [PATCH 15/27] FS-Cache: Provide an add_wait_queue_tail() function David Howells
2008-01-23 0:45 ` [PATCH 16/27] FS-Cache: Generic filesystem caching facility David Howells
2008-01-23 0:45 ` [PATCH 17/27] CacheFiles: Add missing copy_page export for ia64 David Howells
2008-01-23 0:45 ` [PATCH 18/27] CacheFiles: Be consistent about the use of mapping vs file->f_mapping in Ext3 David Howells
2008-01-23 0:45 ` [PATCH 19/27] CacheFiles: Add a hook to write a single page of data to an inode David Howells
2008-01-23 0:45 ` [PATCH 20/27] CacheFiles: Permit the page lock state to be monitored David Howells
2008-01-23 0:45 ` [PATCH 21/27] CacheFiles: Export things for CacheFiles David Howells
2008-01-23 0:45 ` [PATCH 22/27] CacheFiles: A cache that backs onto a mounted filesystem David Howells
2008-01-23 0:45 ` [PATCH 23/27] NFS: Fix memory leak David Howells
2008-01-23 0:45 ` [PATCH 24/27] NFS: Use local caching David Howells
2008-01-23 0:45 ` [PATCH 25/27] NFS: Configuration and mount option changes to enable local caching on NFS David Howells
2008-01-23 0:46 ` David Howells [this message]
2008-01-23 0:46 ` [PATCH 27/27] NFS: Separate caching by superblock, explicitly if necessary David Howells
2008-01-23 17:20 ` [PATCH 14/27] FS-Cache: Recruit a couple of page flags for cache management David Howells
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=20080123004603.15602.71030.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=nfsv4@linux-nfs.org \
--cc=selinux@tycho.nsa.gov \
/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
all inboxes | Powered by JetHome®