diff options
-rw-r--r-- | fs/nfsd/export.c | 17 | ||||
-rw-r--r-- | include/linux/nfsd/export.h | 11 |
2 files changed, 8 insertions, 20 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index cba899a3494e..04b266729802 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c | |||
@@ -861,9 +861,9 @@ exp_get_fsid_key(svc_client *clp, int fsid) | |||
861 | return exp_find_key(clp, FSID_NUM, fsidv, NULL); | 861 | return exp_find_key(clp, FSID_NUM, fsidv, NULL); |
862 | } | 862 | } |
863 | 863 | ||
864 | svc_export * | 864 | static svc_export *exp_get_by_name(svc_client *clp, struct vfsmount *mnt, |
865 | exp_get_by_name(svc_client *clp, struct vfsmount *mnt, struct dentry *dentry, | 865 | struct dentry *dentry, |
866 | struct cache_req *reqp) | 866 | struct cache_req *reqp) |
867 | { | 867 | { |
868 | struct svc_export *exp, key; | 868 | struct svc_export *exp, key; |
869 | int err; | 869 | int err; |
@@ -887,9 +887,9 @@ exp_get_by_name(svc_client *clp, struct vfsmount *mnt, struct dentry *dentry, | |||
887 | /* | 887 | /* |
888 | * Find the export entry for a given dentry. | 888 | * Find the export entry for a given dentry. |
889 | */ | 889 | */ |
890 | struct svc_export * | 890 | static struct svc_export *exp_parent(svc_client *clp, struct vfsmount *mnt, |
891 | exp_parent(svc_client *clp, struct vfsmount *mnt, struct dentry *dentry, | 891 | struct dentry *dentry, |
892 | struct cache_req *reqp) | 892 | struct cache_req *reqp) |
893 | { | 893 | { |
894 | svc_export *exp; | 894 | svc_export *exp; |
895 | 895 | ||
@@ -1214,9 +1214,8 @@ out: | |||
1214 | return err; | 1214 | return err; |
1215 | } | 1215 | } |
1216 | 1216 | ||
1217 | struct svc_export * | 1217 | static struct svc_export *exp_find(struct auth_domain *clp, int fsid_type, |
1218 | exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, | 1218 | u32 *fsidv, struct cache_req *reqp) |
1219 | struct cache_req *reqp) | ||
1220 | { | 1219 | { |
1221 | struct svc_export *exp; | 1220 | struct svc_export *exp; |
1222 | struct svc_expkey *ek = exp_find_key(clp, fsid_type, fsidv, reqp); | 1221 | struct svc_expkey *ek = exp_find_key(clp, fsid_type, fsidv, reqp); |
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index 5cd192469096..bcb7abafbca9 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h | |||
@@ -127,17 +127,9 @@ void nfsd_export_shutdown(void); | |||
127 | void nfsd_export_flush(void); | 127 | void nfsd_export_flush(void); |
128 | void exp_readlock(void); | 128 | void exp_readlock(void); |
129 | void exp_readunlock(void); | 129 | void exp_readunlock(void); |
130 | struct svc_export * exp_get_by_name(struct auth_domain *clp, | ||
131 | struct vfsmount *mnt, | ||
132 | struct dentry *dentry, | ||
133 | struct cache_req *reqp); | ||
134 | struct svc_export * rqst_exp_get_by_name(struct svc_rqst *, | 130 | struct svc_export * rqst_exp_get_by_name(struct svc_rqst *, |
135 | struct vfsmount *, | 131 | struct vfsmount *, |
136 | struct dentry *); | 132 | struct dentry *); |
137 | struct svc_export * exp_parent(struct auth_domain *clp, | ||
138 | struct vfsmount *mnt, | ||
139 | struct dentry *dentry, | ||
140 | struct cache_req *reqp); | ||
141 | struct svc_export * rqst_exp_parent(struct svc_rqst *, | 133 | struct svc_export * rqst_exp_parent(struct svc_rqst *, |
142 | struct vfsmount *mnt, | 134 | struct vfsmount *mnt, |
143 | struct dentry *dentry); | 135 | struct dentry *dentry); |
@@ -157,9 +149,6 @@ static inline void exp_get(struct svc_export *exp) | |||
157 | { | 149 | { |
158 | cache_get(&exp->h); | 150 | cache_get(&exp->h); |
159 | } | 151 | } |
160 | extern struct svc_export * | ||
161 | exp_find(struct auth_domain *clp, int fsid_type, u32 *fsidv, | ||
162 | struct cache_req *reqp); | ||
163 | struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *); | 152 | struct svc_export * rqst_exp_find(struct svc_rqst *, int, u32 *); |
164 | 153 | ||
165 | #endif /* __KERNEL__ */ | 154 | #endif /* __KERNEL__ */ |