1 files changed, 6 insertions, 1 deletions

diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c
index 53507aa96b0b..3800ab6f08fa 100644
--- a/fs/nfs/fscache.c
+++ b/fs/nfs/fscache.c
@@ -114,6 +114,10 @@ void nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, int
         struct rb_node **p, *parent;
         int diff;
 
+        nfss->fscache_key = NULL;
+        nfss->fscache = NULL;
+        if (!(nfss->options & NFS_OPTION_FSCACHE))
+                return;
         if (!uniq) {
                 uniq = "";
                 ulen = 1;
@@ -226,10 +230,11 @@ void nfs_fscache_release_super_cookie(struct super_block *sb)
 void nfs_fscache_init_inode(struct inode *inode)
 {
         struct nfs_fscache_inode_auxdata auxdata;
+        struct nfs_server *nfss = NFS_SERVER(inode);
         struct nfs_inode *nfsi = NFS_I(inode);
 
         nfsi->fscache = NULL;
-        if (!S_ISREG(inode->i_mode))
+        if (!(nfss->fscache && S_ISREG(inode->i_mode)))
                 return;
 
         memset(&auxdata, 0, sizeof(auxdata));