leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Fix a compile issue when CONFIG_NFS_FSCACHE was undefined

Browse Source 
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-05-16 10:21:30 -07:00
parent 7e450b4e47
commit 39ffb9218e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/fscache.h
View File

@ -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_get_client_cookie(struct nfs_client *clp) {}
static inline void nfs_fscache_release_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_release_super_cookie(struct super_block *sb) {}
static inline void nfs_fscache_init_inode_cookie(struct inode *inode) {} static inline void nfs_fscache_init_inode_cookie(struct inode *inode) {}

8
fs/nfs/super.c
View File

@ -2346,6 +2346,7 @@ static int nfs_compare_super(struct super_block *sb, void *data)
return nfs_compare_mount_options(sb, server, mntflags); return nfs_compare_mount_options(sb, server, mntflags);
} }
#ifdef CONFIG_NFS_FSCACHE
static void nfs_get_cache_cookie(struct super_block *sb, static void nfs_get_cache_cookie(struct super_block *sb,
struct nfs_parsed_mount_data *parsed, struct nfs_parsed_mount_data *parsed,
struct nfs_clone_mount *cloned) 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); 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) static int nfs_bdi_register(struct nfs_server *server)
{ {