Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / include / linux / nfsd / export.h

diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 78feb7beff75a41c535a715887c80aeb16e8c88e..3a1687251367bd83b18711303f1ae3a712dbdff0 100644 (file)
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -116,39 +116,20 @@ struct svc_expkey {
 #define EX_NOHIDE(exp)         ((exp)->ex_flags & NFSEXP_NOHIDE)
 #define EX_WGATHER(exp)                ((exp)->ex_flags & NFSEXP_GATHERED_WRITES)
 
-static inline int EX_RDONLY(struct svc_export *exp, struct svc_rqst *rqstp)
-{
-       struct exp_flavor_info *f;
-       struct exp_flavor_info *end = exp->ex_flavors + exp->ex_nflavors;
-
-       for (f = exp->ex_flavors; f < end; f++) {
-               if (f->pseudoflavor == rqstp->rq_flavor)
-                       return f->flags & NFSEXP_READONLY;
-       }
-       return exp->ex_flags & NFSEXP_READONLY;
-}
-
+int nfsexp_flags(struct svc_rqst *rqstp, struct svc_export *exp);
 __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
 
 /*
  * Function declarations
  */
-void                   nfsd_export_init(void);
+int                    nfsd_export_init(void);
 void                   nfsd_export_shutdown(void);
 void                   nfsd_export_flush(void);
 void                   exp_readlock(void);
 void                   exp_readunlock(void);
-struct svc_export *    exp_get_by_name(struct auth_domain *clp,
-                                       struct vfsmount *mnt,
-                                       struct dentry *dentry,
-                                       struct cache_req *reqp);
 struct svc_export *    rqst_exp_get_by_name(struct svc_rqst *,
                                             struct vfsmount *,
                                             struct dentry *);
-struct svc_export *    exp_parent(struct auth_domain *clp,
-                                  struct vfsmount *mnt,
-                                  struct dentry *dentry,
-                                  struct cache_req *reqp);
 struct svc_export *    rqst_exp_parent(struct svc_rqst *,
                                        struct vfsmount *mnt,
                                        struct dentry *dentry);
@@ -168,9 +149,6 @@ static inline void exp_get(struct svc_export *exp)
 {
        cache_get(&exp->h);
 }
-extern struct svc_export *
-exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv,
-        struct cache_req *reqp);
 struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *);
 
 #endif /* __KERNEL__ */