diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-06 22:05:13 -0500 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /include/linux/nfsd/xdr3.h | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/linux/nfsd/xdr3.h')
| -rw-r--r-- | include/linux/nfsd/xdr3.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h index 79963867b0d7..89d9d6061a62 100644 --- a/include/linux/nfsd/xdr3.h +++ b/include/linux/nfsd/xdr3.h | |||
| @@ -331,11 +331,11 @@ int nfs3svc_release_fhandle(struct svc_rqst *, __be32 *, | |||
| 331 | struct nfsd3_attrstat *); | 331 | struct nfsd3_attrstat *); |
| 332 | int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *, | 332 | int nfs3svc_release_fhandle2(struct svc_rqst *, __be32 *, |
| 333 | struct nfsd3_fhandle_pair *); | 333 | struct nfsd3_fhandle_pair *); |
| 334 | int nfs3svc_encode_entry(struct readdir_cd *, const char *name, | 334 | int nfs3svc_encode_entry(void *, const char *name, |
| 335 | int namlen, loff_t offset, ino_t ino, | 335 | int namlen, loff_t offset, u64 ino, |
| 336 | unsigned int); | 336 | unsigned int); |
| 337 | int nfs3svc_encode_entry_plus(struct readdir_cd *, const char *name, | 337 | int nfs3svc_encode_entry_plus(void *, const char *name, |
| 338 | int namlen, loff_t offset, ino_t ino, | 338 | int namlen, loff_t offset, u64 ino, |
| 339 | unsigned int); | 339 | unsigned int); |
| 340 | /* Helper functions for NFSv3 ACL code */ | 340 | /* Helper functions for NFSv3 ACL code */ |
| 341 | __be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, | 341 | __be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p, |