diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-16 17:21:30 (GMT) |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-16 17:24:20 (GMT) |
| commit | 39ffb9218e41b1ef4920432776791f5e9ed2eff3 (patch) | |
| tree | 0b1b02a1b252b587b78628a6f0f412e80dec0ace | |
| parent | 7e450b4e47d14429d0cc17cf4ce389fc027937be (diff) | |
| download | linux-39ffb9218e41b1ef4920432776791f5e9ed2eff3.tar.xz | |
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>
| -rw-r--r-- | fs/nfs/fscache.h | 6 | ||||
| -rw-r--r-- | fs/nfs/super.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/fs/nfs/fscache.h b/fs/nfs/fscache.h index 2a08b91..c5b11b5 100644 --- 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 c3ae819..a973eb1 100644 --- 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) { |