diff options
-rw-r--r-- | fs/nfsd/nfsfh.c | 10 | ||||
-rw-r--r-- | include/linux/nfsd/nfsfh.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 501d83884530..727ab3bd450d 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c | |||
@@ -76,7 +76,7 @@ static int nfsd_acceptable(void *expv, struct dentry *dentry) | |||
76 | * comment in the NFSv3 spec says this is incorrect (implementation notes for | 76 | * comment in the NFSv3 spec says this is incorrect (implementation notes for |
77 | * the write call). | 77 | * the write call). |
78 | */ | 78 | */ |
79 | static inline int | 79 | static inline __be32 |
80 | nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) | 80 | nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) |
81 | { | 81 | { |
82 | /* Type can be negative when creating hardlinks - not to a dir */ | 82 | /* Type can be negative when creating hardlinks - not to a dir */ |
@@ -110,13 +110,13 @@ nfsd_mode_check(struct svc_rqst *rqstp, umode_t mode, int type) | |||
110 | * This is only called at the start of an nfsproc call, so fhp points to | 110 | * This is only called at the start of an nfsproc call, so fhp points to |
111 | * a svc_fh which is all 0 except for the over-the-wire file handle. | 111 | * a svc_fh which is all 0 except for the over-the-wire file handle. |
112 | */ | 112 | */ |
113 | u32 | 113 | __be32 |
114 | fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) | 114 | fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) |
115 | { | 115 | { |
116 | struct knfsd_fh *fh = &fhp->fh_handle; | 116 | struct knfsd_fh *fh = &fhp->fh_handle; |
117 | struct svc_export *exp = NULL; | 117 | struct svc_export *exp = NULL; |
118 | struct dentry *dentry; | 118 | struct dentry *dentry; |
119 | u32 error = 0; | 119 | __be32 error = 0; |
120 | 120 | ||
121 | dprintk("nfsd: fh_verify(%s)\n", SVCFH_fmt(fhp)); | 121 | dprintk("nfsd: fh_verify(%s)\n", SVCFH_fmt(fhp)); |
122 | 122 | ||
@@ -315,7 +315,7 @@ static inline void _fh_update_old(struct dentry *dentry, | |||
315 | fh->ofh_dirino = 0; | 315 | fh->ofh_dirino = 0; |
316 | } | 316 | } |
317 | 317 | ||
318 | int | 318 | __be32 |
319 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) | 319 | fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, struct svc_fh *ref_fh) |
320 | { | 320 | { |
321 | /* ref_fh is a reference file handle. | 321 | /* ref_fh is a reference file handle. |
@@ -451,7 +451,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, st | |||
451 | * Update file handle information after changing a dentry. | 451 | * Update file handle information after changing a dentry. |
452 | * This is only called by nfsd_create, nfsd_create_v3 and nfsd_proc_create | 452 | * This is only called by nfsd_create, nfsd_create_v3 and nfsd_proc_create |
453 | */ | 453 | */ |
454 | int | 454 | __be32 |
455 | fh_update(struct svc_fh *fhp) | 455 | fh_update(struct svc_fh *fhp) |
456 | { | 456 | { |
457 | struct dentry *dentry; | 457 | struct dentry *dentry; |
diff --git a/include/linux/nfsd/nfsfh.h b/include/linux/nfsd/nfsfh.h index 069257ea99a0..749bad1ca16f 100644 --- a/include/linux/nfsd/nfsfh.h +++ b/include/linux/nfsd/nfsfh.h | |||
@@ -209,9 +209,9 @@ extern char * SVCFH_fmt(struct svc_fh *fhp); | |||
209 | /* | 209 | /* |
210 | * Function prototypes | 210 | * Function prototypes |
211 | */ | 211 | */ |
212 | u32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); | 212 | __be32 fh_verify(struct svc_rqst *, struct svc_fh *, int, int); |
213 | int fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); | 213 | __be32 fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *); |
214 | int fh_update(struct svc_fh *); | 214 | __be32 fh_update(struct svc_fh *); |
215 | void fh_put(struct svc_fh *); | 215 | void fh_put(struct svc_fh *); |
216 | 216 | ||
217 | static __inline__ struct svc_fh * | 217 | static __inline__ struct svc_fh * |