NFS: Fix a compile issue when CONFIG_NFS_FSCACHE was undefined

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h
index 2a08b9130ec163c9410c82035b91e9f9cec4fc30..c5b11b53ff33b33d4249a88443b102ae33f00df5 100644 (file)
--- a/fs/nfs/fscache.h
+++ b/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/fs/nfs/super.c b/fs/nfs/super.c
index c3ae819185509ce1354566d6fc78418a9608918c..a973eb101a928df8524ddb13da26bb40a7243564 100644 (file)
--- a/fs/nfs/super.c
+++ b/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)
 {