diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2015-02-13 12:34:25 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-16 11:43:13 -0500 |
| commit | a51f25a587e16bf89dce3f821de99b7717782859 (patch) | |
| tree | 1758c57c3578030897930d86d20ae0aace88d879 /fs | |
| parent | 0ab39de6b341189589093777f241dd803b417fc0 (diff) | |
| download | linux-a51f25a587e16bf89dce3f821de99b7717782859.tar.gz linux-a51f25a587e16bf89dce3f821de99b7717782859.tar.bz2 linux-a51f25a587e16bf89dce3f821de99b7717782859.zip | |
nfsd4: fix v3-less build
Includes of pnfs.h in export.c and fcntl.c also bring in xdr4.h, which
won't build without CONFIG_NFSD_V3, breaking non-V3 builds. Ifdef-out
most of pnfs.h in that case.
Reported-by: Bas Peters <baspeters93@gmail.com>
Reported-by: Jim Davis <jim.epost@gmail.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Fixes: 9cf514ccfac "nfsd: implement pNFS operations"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/pnfs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h index fedb4d620a81..d4c4453674c6 100644 --- a/fs/nfsd/pnfs.h +++ b/fs/nfsd/pnfs.h @@ -1,6 +1,7 @@ #ifndef _FS_NFSD_PNFS_H #define _FS_NFSD_PNFS_H 1 +#ifdef CONFIG_NFSD_V4 #include <linux/exportfs.h> #include <linux/nfsd/export.h> @@ -50,6 +51,7 @@ __be32 nfsd4_return_client_layouts(struct svc_rqst *rqstp, int nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp, u32 device_generation); struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx); +#endif /* CONFIG_NFSD_V4 */ #ifdef CONFIG_NFSD_PNFS void nfsd4_setup_layout_type(struct svc_export *exp); @@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp, int nfsd4_init_pnfs(void); void nfsd4_exit_pnfs(void); #else +struct nfs4_client; +struct nfs4_file; + static inline void nfsd4_setup_layout_type(struct svc_export *exp) { } |