nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / fs / nfsd / nfsxdr.c

diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index 6035e03..4ce005d 100644 (file)
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -1,20 +1,11 @@
 /*
- * linux/fs/nfsd/nfsxdr.c
- *
  * XDR support for nfsd
  *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/nfs.h>
-#include <linux/vfs.h>
-#include <linux/sunrpc/xdr.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
-#include <linux/nfsd/xdr.h>
-#include <linux/mm.h>
+#include "xdr.h"
+#include "auth.h"
 
 #define NFSDDBG_FACILITY               NFSDDBG_XDR
 
@@ -62,10 +53,10 @@ encode_fh(__be32 *p, struct svc_fh *fhp)
  * no slashes or null bytes.
  */
 static __be32 *
-decode_filename(__be32 *p, char **namp, int *lenp)
+decode_filename(__be32 *p, char **namp, unsigned int *lenp)
 {
        char            *name;
-       int             i;
+       unsigned int    i;
 
        if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS_MAXNAMLEN)) != NULL) {
                for (i = 0, name = *namp; i < *lenp; i++, name++) {
@@ -78,10 +69,10 @@ decode_filename(__be32 *p, char **namp, int *lenp)
 }
 
 static __be32 *
-decode_pathname(__be32 *p, char **namp, int *lenp)
+decode_pathname(__be32 *p, char **namp, unsigned int *lenp)
 {
        char            *name;
-       int             i;
+       unsigned int    i;
 
        if ((p = xdr_decode_string_inplace(p, namp, lenp, NFS_MAXPATHLEN)) != NULL) {
                for (i = 0, name = *namp; i < *lenp; i++, name++) {
@@ -206,7 +197,7 @@ encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp,
 __be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp)
 {
        struct kstat stat;
-       vfs_getattr(fhp->fh_export->ex_mnt, fhp->fh_dentry, &stat);
+       vfs_getattr(fhp->fh_export->ex_path.mnt, fhp->fh_dentry, &stat);
        return encode_fattr(rqstp, p, fhp, &stat);
 }
 
@@ -231,9 +222,10 @@ int
 nfssvc_decode_sattrargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd_sattrargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh))
-        || !(p = decode_sattr(p, &args->attrs)))
+       p = decode_fh(p, &args->fh);
+       if (!p)
                return 0;
+       p = decode_sattr(p, &args->attrs);
 
        return xdr_argsize_check(rqstp, p);
 }
@@ -303,29 +295,20 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p,
        /*
         * Check to make sure that we got the right number of
         * bytes.
-        *
-        * If more than one page was used, then compute the length
-        * of the data in the request as the total size of the
-        * request minus the transport protocol headers minus the
-        * RPC protocol headers minus the NFS protocol fields
-        * already consumed.  If the request fits into a single
-        * page, then compete the length of the data as the size
-        * of the NFS portion of the request minus the NFS
-        * protocol fields already consumed.
         */
        hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;
-       if (rqstp->rq_respages != rqstp->rq_pages + 1) {
-               dlen = rqstp->rq_arg.len -
-                       (PAGE_SIZE - rqstp->rq_arg.head[0].iov_len) - hdr;
-       } else {
-               dlen = rqstp->rq_arg.head[0].iov_len - hdr;
-       }
+       dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len
+               - hdr;
+
        /*
         * Round the length of the data which was specified up to
         * the next multiple of XDR units and then compare that
         * against the length which was actually received.
+        * Note that when RPCSEC/GSS (for example) is used, the
+        * data buffer can be padded so dlen might be larger
+        * than required.  It must never be smaller.
         */
-       if (dlen != ((len + 3) & ~0x3))
+       if (dlen < XDR_QUADLEN(len)*4)
                return 0;
 
        rqstp->rq_vec[0].iov_base = (void*)p;
@@ -346,10 +329,10 @@ int
 nfssvc_decode_createargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd_createargs *args)
 {
-       if (!(p = decode_fh(p, &args->fh))
-        || !(p = decode_filename(p, &args->name, &args->len))
-        || !(p = decode_sattr(p, &args->attrs)))
+       if (   !(p = decode_fh(p, &args->fh))
+           || !(p = decode_filename(p, &args->name, &args->len)))
                return 0;
+       p = decode_sattr(p, &args->attrs);
 
        return xdr_argsize_check(rqstp, p);
 }
@@ -393,11 +376,11 @@ int
 nfssvc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p,
                                        struct nfsd_symlinkargs *args)
 {
-       if (!(p = decode_fh(p, &args->ffh))
-        || !(p = decode_filename(p, &args->fname, &args->flen))
-        || !(p = decode_pathname(p, &args->tname, &args->tlen))
-        || !(p = decode_sattr(p, &args->attrs)))
+       if (   !(p = decode_fh(p, &args->ffh))
+           || !(p = decode_filename(p, &args->fname, &args->flen))
+           || !(p = decode_pathname(p, &args->tname, &args->tlen)))
                return 0;
+       p = decode_sattr(p, &args->attrs);
 
        return xdr_argsize_check(rqstp, p);
 }
@@ -534,6 +517,10 @@ nfssvc_encode_entry(void *ccdv, const char *name,
                cd->common.err = nfserr_toosmall;
                return -EINVAL;
        }
+       if (ino > ~((u32) 0)) {
+               cd->common.err = nfserr_fbig;
+               return -EINVAL;
+       }
        *p++ = xdr_one;                         /* mark entry present */
        *p++ = htonl((u32) ino);                /* file id */
        p    = xdr_encode_array(p, name, namlen);/* name length & name */