Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
index ecccef777dae357ff10aaf6d21e744b1a0108295..3f4f7142bbe3920575017f2f42b8f443f06f30b7 100644 (file)
--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@@ -88,10 +88,12 @@ struct nfsd_readdirargs {
 
 struct nfsd_attrstat {
        struct svc_fh           fh;
+       struct kstat            stat;
 };
 
 struct nfsd_diropres  {
        struct svc_fh           fh;
+       struct kstat            stat;
 };
 
 struct nfsd_readlinkres {
@@ -101,6 +103,7 @@ struct nfsd_readlinkres {
 struct nfsd_readres {
        struct svc_fh           fh;
        unsigned long           count;
+       struct kstat            stat;
 };
 
 struct nfsd_readdirres {
@@ -169,4 +172,8 @@ int nfssvc_encode_entry(struct readdir_cd *, const char *name,
 
 int nfssvc_release_fhandle(struct svc_rqst *, u32 *, struct nfsd_fhandle *);
 
+/* Helper functions for NFSv2 ACL code */
+u32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, u32 *p, struct svc_fh *fhp);
+u32 *nfs2svc_decode_fh(u32 *p, struct svc_fh *fhp);
+
 #endif /* LINUX_NFSD_H */