From 467b24602b31291b3c11a91edfe76343ffe5109b Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 16 May 2012 10:21:30 -0700
Subject: [PATCH] --- yaml --- r: 308616 b: refs/heads/master c:
 39ffb9218e41b1ef4920432776791f5e9ed2eff3 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/nfs/fscache.h | 6 ------
 trunk/fs/nfs/super.c   | 8 ++++++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 9d337b3e89c9..5a832cbb961c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e450b4e47d14429d0cc17cf4ce389fc027937be
+refs/heads/master: 39ffb9218e41b1ef4920432776791f5e9ed2eff3
diff --git a/trunk/fs/nfs/fscache.h b/trunk/fs/nfs/fscache.h
index 2a08b9130ec1..c5b11b53ff33 100644
--- a/trunk/fs/nfs/fscache.h
+++ b/trunk/fs/nfs/fscache.h
@@ -170,12 +170,6 @@ static inline void nfs_fscache_unregister(void) {}
 static inline void nfs_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_get_super_cookie(
-	struct super_block *sb,
-	const char *uniq,
-	struct nfs_clone_mount *mntdata)
-{
-}
 static inline void nfs_fscache_release_super_cookie(struct super_block *sb) {}
 
 static inline void nfs_fscache_init_inode_cookie(struct inode *inode) {}
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index c3ae81918550..a973eb101a92 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2346,6 +2346,7 @@ static int nfs_compare_super(struct super_block *sb, void *data)
 	return nfs_compare_mount_options(sb, server, mntflags);
 }
 
+#ifdef CONFIG_NFS_FSCACHE
 static void nfs_get_cache_cookie(struct super_block *sb,
 				 struct nfs_parsed_mount_data *parsed,
 				 struct nfs_clone_mount *cloned)
@@ -2366,6 +2367,13 @@ static void nfs_get_cache_cookie(struct super_block *sb,
 
 	nfs_fscache_get_super_cookie(sb, uniq, ulen);
 }
+#else
+static void nfs_get_cache_cookie(struct super_block *sb,
+				 struct nfs_parsed_mount_data *parsed,
+				 struct nfs_clone_mount *cloned)
+{
+}
+#endif
 
 static int nfs_bdi_register(struct nfs_server *server)
 {