Merge tag 'v3.5-rc1'

[~andy/linux] / include / linux / nfsd / export.h

diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index f85308e688fd712f039ac45a5f442240113ad0bf..e33f747b173c500d02639dfd5257de093a79fff0 100644 (file)
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -103,6 +103,7 @@ struct svc_export {
        struct nfsd4_fs_locations ex_fslocs;
        int                     ex_nflavors;
        struct exp_flavor_info  ex_flavors[MAX_SECINFO_LIST];
+       struct cache_detail     *cd;
 };
 
 /* an "export key" (expkey) maps a filehandlefragement to an
@@ -129,24 +130,22 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
 /*
  * Function declarations
  */
-int                    nfsd_export_init(void);
-void                   nfsd_export_shutdown(void);
-void                   nfsd_export_flush(void);
+int                    nfsd_export_init(struct net *);
+void                   nfsd_export_shutdown(struct net *);
+void                   nfsd_export_flush(struct net *);
 struct svc_export *    rqst_exp_get_by_name(struct svc_rqst *,
                                             struct path *);
 struct svc_export *    rqst_exp_parent(struct svc_rqst *,
                                        struct path *);
 struct svc_export *    rqst_find_fsidzero_export(struct svc_rqst *);
-int                    exp_rootfh(struct auth_domain *, 
+int                    exp_rootfh(struct net *, struct auth_domain *,
                                        char *path, struct knfsd_fh *, int maxsize);
 __be32                 exp_pseudoroot(struct svc_rqst *, struct svc_fh *);
 __be32                 nfserrno(int errno);
 
-extern struct cache_detail svc_export_cache;
-
 static inline void exp_put(struct svc_export *exp)
 {
-       cache_put(&exp->h, &svc_export_cache);
+       cache_put(&exp->h, exp->cd);
 }
 
 static inline void exp_get(struct svc_export *exp)