Commit 533cf7ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "These are fixes for two bugs introduced during the merge window"

* 'for-3.20' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix v3-less build
  nfsd: fix comparison in fh_fsid_match()
parents 03891159 a51f25a5
...@@ -200,7 +200,7 @@ static inline bool fh_fsid_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) ...@@ -200,7 +200,7 @@ static inline bool fh_fsid_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2)
{ {
if (fh1->fh_fsid_type != fh2->fh_fsid_type) if (fh1->fh_fsid_type != fh2->fh_fsid_type)
return false; return false;
if (memcmp(fh1->fh_fsid, fh2->fh_fsid, key_len(fh1->fh_fsid_type) != 0)) if (memcmp(fh1->fh_fsid, fh2->fh_fsid, key_len(fh1->fh_fsid_type)) != 0)
return false; return false;
return true; return true;
} }
......
#ifndef _FS_NFSD_PNFS_H #ifndef _FS_NFSD_PNFS_H
#define _FS_NFSD_PNFS_H 1 #define _FS_NFSD_PNFS_H 1
#ifdef CONFIG_NFSD_V4
#include <linux/exportfs.h> #include <linux/exportfs.h>
#include <linux/nfsd/export.h> #include <linux/nfsd/export.h>
...@@ -50,6 +51,7 @@ __be32 nfsd4_return_client_layouts(struct svc_rqst *rqstp, ...@@ -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, int nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp,
u32 device_generation); u32 device_generation);
struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx); struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx);
#endif /* CONFIG_NFSD_V4 */
#ifdef CONFIG_NFSD_PNFS #ifdef CONFIG_NFSD_PNFS
void nfsd4_setup_layout_type(struct svc_export *exp); void nfsd4_setup_layout_type(struct svc_export *exp);
...@@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp, ...@@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp,
int nfsd4_init_pnfs(void); int nfsd4_init_pnfs(void);
void nfsd4_exit_pnfs(void); void nfsd4_exit_pnfs(void);
#else #else
struct nfs4_client;
struct nfs4_file;
static inline void nfsd4_setup_layout_type(struct svc_export *exp) static inline void nfsd4_setup_layout_type(struct svc_export *exp)
{ {
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment