nfsd: Headers Independence and include cleanups

[pandora-kernel.git] / include / linux / nfsd / xdr.h

diff --git a/include/linux/nfsd/xdr.h b/include/linux/nfsd/xdr.h
index 877192d..58f824d 100644 (file)
--- a/include/linux/nfsd/xdr.h
+++ b/include/linux/nfsd/xdr.h
@@ -7,9 +7,8 @@
 #ifndef LINUX_NFSD_H
 #define LINUX_NFSD_H
 
-#include <linux/fs.h>
 #include <linux/vfs.h>
-#include <linux/nfs.h>
+#include <linux/nfsd/nfsd.h>
 
 struct nfsd_fhandle {
        struct svc_fh           fh;
@@ -23,7 +22,7 @@ struct nfsd_sattrargs {
 struct nfsd_diropargs {
        struct svc_fh           fh;
        char *                  name;
-       int                     len;
+       unsigned int            len;
 };
 
 struct nfsd_readargs {
@@ -43,17 +42,17 @@ struct nfsd_writeargs {
 struct nfsd_createargs {
        struct svc_fh           fh;
        char *                  name;
-       int                     len;
+       unsigned int            len;
        struct iattr            attrs;
 };
 
 struct nfsd_renameargs {
        struct svc_fh           ffh;
        char *                  fname;
-       int                     flen;
+       unsigned int            flen;
        struct svc_fh           tfh;
        char *                  tname;
-       int                     tlen;
+       unsigned int            tlen;
 };
 
 struct nfsd_readlinkargs {
@@ -65,15 +64,15 @@ struct nfsd_linkargs {
        struct svc_fh           ffh;
        struct svc_fh           tfh;
        char *                  tname;
-       int                     tlen;
+       unsigned int            tlen;
 };
 
 struct nfsd_symlinkargs {
        struct svc_fh           ffh;
        char *                  fname;
-       int                     flen;
+       unsigned int            flen;
        char *                  tname;
-       int                     tlen;
+       unsigned int            tlen;
        struct iattr            attrs;
 };
 
@@ -165,8 +164,8 @@ int nfssvc_encode_readres(struct svc_rqst *, __be32 *, struct nfsd_readres *);
 int nfssvc_encode_statfsres(struct svc_rqst *, __be32 *, struct nfsd_statfsres *);
 int nfssvc_encode_readdirres(struct svc_rqst *, __be32 *, struct nfsd_readdirres *);
 
-int nfssvc_encode_entry(struct readdir_cd *, const char *name,
-                               int namlen, loff_t offset, ino_t ino, unsigned int);
+int nfssvc_encode_entry(void *, const char *name,
+                       int namlen, loff_t offset, u64 ino, unsigned int);
 
 int nfssvc_release_fhandle(struct svc_rqst *, __be32 *, struct nfsd_fhandle *);