vserver 1.9.5.x5

[linux-2.6.git] / fs / nfsd / nfs3xdr.c

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index d102365..0c133b9 100644 (file)
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -102,22 +102,6 @@ decode_filename(u32 *p, char **namp, int *lenp)
        return p;
 }
 
-static inline u32 *
-decode_pathname(u32 *p, char **namp, int *lenp)
-{
-       char            *name;
-       int             i;
-
-       if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS3_MAXPATHLEN)) != NULL) {
-               for (i = 0, name = *namp; i < *lenp; i++, name++) {
-                       if (*name == '\0')
-                               return NULL;
-               }
-       }
-
-       return p;
-}
-
 static inline u32 *
 decode_sattr3(u32 *p, struct iattr *iap)
 {
@@ -770,10 +754,16 @@ nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p,
                /* stupid readdir cookie */
                memcpy(p, resp->verf, 8); p += 2;
                xdr_ressize_check(rqstp, p);
-               p = resp->buffer;
+               if (rqstp->rq_res.head[0].iov_len + (2<<2) > PAGE_SIZE)
+                       return 1; /*No room for trailer */
+               rqstp->rq_res.page_len = (resp->count) << 2;
+
+               /* add the 'tail' to the end of the 'head' page - page 0. */
+               rqstp->rq_restailpage = 0;
+               rqstp->rq_res.tail[0].iov_base = p;
                *p++ = 0;               /* no more entries */
                *p++ = htonl(resp->common.err == nfserr_eof);
-               rqstp->rq_res.page_len = (resp->count + 2) << 2;
+               rqstp->rq_res.tail[0].iov_len = 2<<2;
                return 1;
        } else
                return xdr_ressize_check(rqstp, p);