Patched in Tegra support.

1 files changed, 59 insertions, 107 deletions

diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index bffc32406fb..183c6b123d0 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -86,8 +86,6 @@
                                 XDR_QUADLEN(NFS_ACL_INLINE_BUFSIZE))
 #define ACL3_setaclres_sz       (1+NFS3_post_op_attr_sz)
 
-static int nfs3_stat_to_errno(enum nfs_stat);
-
 /*
  * Map file type to S_IFMT bits
  */
@@ -198,7 +196,7 @@ static void encode_filename3(struct xdr_stream *xdr,
 {
         __be32 *p;
 
-        WARN_ON_ONCE(length > NFS3_MAXNAMLEN);
+        BUG_ON(length > NFS3_MAXNAMLEN);
         p = xdr_reserve_space(xdr, 4 + length);
         xdr_encode_opaque(p, name, length);
 }
@@ -238,6 +236,7 @@ out_overflow:
 static void encode_nfspath3(struct xdr_stream *xdr, struct page **pages,
                             const u32 length)
 {
+        BUG_ON(length > NFS3_MAXPATHLEN);
         encode_uint32(xdr, length);
         xdr_write_pages(xdr, pages, 0, length);
 }
@@ -245,6 +244,7 @@ static void encode_nfspath3(struct xdr_stream *xdr, struct page **pages,
 static int decode_nfspath3(struct xdr_stream *xdr)
 {
         u32 recvd, count;
+        size_t hdrlen;
         __be32 *p;
 
         p = xdr_inline_decode(xdr, 4);
@@ -253,9 +253,12 @@ static int decode_nfspath3(struct xdr_stream *xdr)
         count = be32_to_cpup(p);
         if (unlikely(count >= xdr->buf->page_len || count > NFS3_MAXPATHLEN))
                 goto out_nametoolong;
-        recvd = xdr_read_pages(xdr, count);
+        hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
+        recvd = xdr->buf->len - hdrlen;
         if (unlikely(count > recvd))
                 goto out_cheating;
+
+        xdr_read_pages(xdr, count);
         xdr_terminate_string(xdr->buf, count);
         return 0;
 
@@ -324,14 +327,14 @@ static void encode_createverf3(struct xdr_stream *xdr, const __be32 *verifier)
         memcpy(p, verifier, NFS3_CREATEVERFSIZE);
 }
 
-static int decode_writeverf3(struct xdr_stream *xdr, struct nfs_write_verifier *verifier)
+static int decode_writeverf3(struct xdr_stream *xdr, __be32 *verifier)
 {
         __be32 *p;
 
         p = xdr_inline_decode(xdr, NFS3_WRITEVERFSIZE);
         if (unlikely(p == NULL))
                 goto out_overflow;
-        memcpy(verifier->data, p, NFS3_WRITEVERFSIZE);
+        memcpy(verifier, p, NFS3_WRITEVERFSIZE);
         return 0;
 out_overflow:
         print_overflow_msg(__func__, xdr);
@@ -387,6 +390,7 @@ out_overflow:
  */
 static void encode_ftype3(struct xdr_stream *xdr, const u32 type)
 {
+        BUG_ON(type > NF3FIFO);
         encode_uint32(xdr, type);
 }
 
@@ -441,7 +445,7 @@ static void encode_nfs_fh3(struct xdr_stream *xdr, const struct nfs_fh *fh)
 {
         __be32 *p;
 
-        WARN_ON_ONCE(fh->size > NFS3_FHSIZE);
+        BUG_ON(fh->size > NFS3_FHSIZE);
         p = xdr_reserve_space(xdr, 4 + fh->size);
         xdr_encode_opaque(p, fh->data, fh->size);
 }
@@ -671,7 +675,6 @@ static int decode_fattr3(struct xdr_stream *xdr, struct nfs_fattr *fattr)
         p = xdr_decode_nfstime3(p, &fattr->atime);
         p = xdr_decode_nfstime3(p, &fattr->mtime);
         xdr_decode_nfstime3(p, &fattr->ctime);
-        fattr->change_attr = nfs_timespec_to_change_attr(&fattr->ctime);
 
         fattr->valid |= NFS_ATTR_FATTR_V3;
         return 0;
@@ -722,14 +725,12 @@ static int decode_wcc_attr(struct xdr_stream *xdr, struct nfs_fattr *fattr)
                 goto out_overflow;
 
         fattr->valid |= NFS_ATTR_FATTR_PRESIZE
-                | NFS_ATTR_FATTR_PRECHANGE
                 | NFS_ATTR_FATTR_PREMTIME
                 | NFS_ATTR_FATTR_PRECTIME;
 
         p = xdr_decode_size3(p, &fattr->pre_size);
         p = xdr_decode_nfstime3(p, &fattr->pre_mtime);
         xdr_decode_nfstime3(p, &fattr->pre_ctime);
-        fattr->pre_change_attr = nfs_timespec_to_change_attr(&fattr->pre_ctime);
 
         return 0;
 out_overflow:
@@ -1286,7 +1287,7 @@ static void nfs3_xdr_enc_readdirplus3args(struct rpc_rqst *req,
  *      };
  */
 static void encode_commit3args(struct xdr_stream *xdr,
-                               const struct nfs_commitargs *args)
+                               const struct nfs_writeargs *args)
 {
         __be32 *p;
 
@@ -1299,7 +1300,7 @@ static void encode_commit3args(struct xdr_stream *xdr,
 
 static void nfs3_xdr_enc_commit3args(struct rpc_rqst *req,
                                      struct xdr_stream *xdr,
-                                     const struct nfs_commitargs *args)
+                                     const struct nfs_writeargs *args)
 {
         encode_commit3args(xdr, args);
 }
@@ -1337,7 +1338,6 @@ static void nfs3_xdr_enc_setacl3args(struct rpc_rqst *req,
         error = nfsacl_encode(xdr->buf, base, args->inode,
                             (args->mask & NFS_ACL) ?
                             args->acl_access : NULL, 1, 0);
-        /* FIXME: this is just broken */
         BUG_ON(error < 0);
         error = nfsacl_encode(xdr->buf, base + error, args->inode,
                             (args->mask & NFS_DFACL) ?
@@ -1385,7 +1385,7 @@ static int nfs3_xdr_dec_getattr3res(struct rpc_rqst *req,
 out:
         return error;
 out_default:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1424,7 +1424,7 @@ static int nfs3_xdr_dec_setattr3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1472,7 +1472,7 @@ out_default:
         error = decode_post_op_attr(xdr, result->dir_attr);
         if (unlikely(error))
                 goto out;
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1513,7 +1513,7 @@ static int nfs3_xdr_dec_access3res(struct rpc_rqst *req,
 out:
         return error;
 out_default:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1554,7 +1554,7 @@ static int nfs3_xdr_dec_readlink3res(struct rpc_rqst *req,
 out:
         return error;
 out_default:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1582,6 +1582,7 @@ static int decode_read3resok(struct xdr_stream *xdr,
                              struct nfs_readres *result)
 {
         u32 eof, count, ocount, recvd;
+        size_t hdrlen;
         __be32 *p;
 
         p = xdr_inline_decode(xdr, 4 + 4 + 4);
@@ -1592,10 +1593,13 @@ static int decode_read3resok(struct xdr_stream *xdr,
         ocount = be32_to_cpup(p++);
         if (unlikely(ocount != count))
                 goto out_mismatch;
-        recvd = xdr_read_pages(xdr, count);
+        hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
+        recvd = xdr->buf->len - hdrlen;
         if (unlikely(count > recvd))
                 goto out_cheating;
+
 out:
+        xdr_read_pages(xdr, count);
         result->eof = eof;
         result->count = count;
         return count;
@@ -1632,7 +1636,7 @@ static int nfs3_xdr_dec_read3res(struct rpc_rqst *req, struct xdr_stream *xdr,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1667,22 +1671,20 @@ static int decode_write3resok(struct xdr_stream *xdr,
 {
         __be32 *p;
 
-        p = xdr_inline_decode(xdr, 4 + 4);
+        p = xdr_inline_decode(xdr, 4 + 4 + NFS3_WRITEVERFSIZE);
         if (unlikely(p == NULL))
                 goto out_overflow;
         result->count = be32_to_cpup(p++);
         result->verf->committed = be32_to_cpup(p++);
         if (unlikely(result->verf->committed > NFS_FILE_SYNC))
                 goto out_badvalue;
-        if (decode_writeverf3(xdr, &result->verf->verifier))
-                goto out_eio;
+        memcpy(result->verf->verifier, p, NFS3_WRITEVERFSIZE);
         return result->count;
 out_badvalue:
         dprintk("NFS: bad stable_how value: %u\n", result->verf->committed);
         return -EIO;
 out_overflow:
         print_overflow_msg(__func__, xdr);
-out_eio:
         return -EIO;
 }
 
@@ -1704,7 +1706,7 @@ static int nfs3_xdr_dec_write3res(struct rpc_rqst *req, struct xdr_stream *xdr,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1768,7 +1770,7 @@ out_default:
         error = decode_wcc_data(xdr, result->dir_attr);
         if (unlikely(error))
                 goto out;
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1807,7 +1809,7 @@ static int nfs3_xdr_dec_remove3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1851,7 +1853,7 @@ static int nfs3_xdr_dec_rename3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -1894,7 +1896,7 @@ static int nfs3_xdr_dec_link3res(struct rpc_rqst *req, struct xdr_stream *xdr,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /**
@@ -2032,7 +2034,22 @@ out_truncated:
  */
 static int decode_dirlist3(struct xdr_stream *xdr)
 {
-        return xdr_read_pages(xdr, xdr->buf->page_len);
+        u32 recvd, pglen;
+        size_t hdrlen;
+
+        pglen = xdr->buf->page_len;
+        hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
+        recvd = xdr->buf->len - hdrlen;
+        if (unlikely(pglen > recvd))
+                goto out_cheating;
+out:
+        xdr_read_pages(xdr, pglen);
+        return pglen;
+out_cheating:
+        dprintk("NFS: server cheating in readdir result: "
+                "pglen %u > recvd %u\n", pglen, recvd);
+        pglen = recvd;
+        goto out;
 }
 
 static int decode_readdir3resok(struct xdr_stream *xdr,
@@ -2071,7 +2088,7 @@ out_default:
         error = decode_post_op_attr(xdr, result->dir_attr);
         if (unlikely(error))
                 goto out;
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -2139,7 +2156,7 @@ static int nfs3_xdr_dec_fsstat3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -2215,7 +2232,7 @@ static int nfs3_xdr_dec_fsinfo3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -2278,7 +2295,7 @@ static int nfs3_xdr_dec_pathconf3res(struct rpc_rqst *req,
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 /*
@@ -2302,7 +2319,7 @@ out_status:
  */
 static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req,
                                    struct xdr_stream *xdr,
-                                   struct nfs_commitres *result)
+                                   struct nfs_writeres *result)
 {
         enum nfs_stat status;
         int error;
@@ -2315,11 +2332,11 @@ static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req,
                 goto out;
         if (status != NFS3_OK)
                 goto out_status;
-        error = decode_writeverf3(xdr, &result->verf->verifier);
+        error = decode_writeverf3(xdr, result->verf->verifier);
 out:
         return error;
 out_status:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 #ifdef CONFIG_NFS_V3_ACL
@@ -2342,7 +2359,7 @@ static inline int decode_getacl3resok(struct xdr_stream *xdr,
         if (result->mask & ~(NFS_ACL|NFS_ACLCNT|NFS_DFACL|NFS_DFACLCNT))
                 goto out;
 
-        hdrlen = xdr_stream_pos(xdr);
+        hdrlen = (u8 *)xdr->p - (u8 *)xdr->iov->iov_base;
 
         acl = NULL;
         if (result->mask & NFS_ACL)
@@ -2384,7 +2401,7 @@ static int nfs3_xdr_dec_getacl3res(struct rpc_rqst *req,
 out:
         return error;
 out_default:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req,
@@ -2403,76 +2420,11 @@ static int nfs3_xdr_dec_setacl3res(struct rpc_rqst *req,
 out:
         return error;
 out_default:
-        return nfs3_stat_to_errno(status);
+        return nfs_stat_to_errno(status);
 }
 
 #endif  /* CONFIG_NFS_V3_ACL */
 
-
-/*
- * We need to translate between nfs status return values and
- * the local errno values which may not be the same.
- */
-static const struct {
-        int stat;
-        int errno;
-} nfs_errtbl[] = {
-        { NFS_OK,               0               },
-        { NFSERR_PERM,          -EPERM          },
-        { NFSERR_NOENT,         -ENOENT         },
-        { NFSERR_IO,            -errno_NFSERR_IO},
-        { NFSERR_NXIO,          -ENXIO          },
-/*      { NFSERR_EAGAIN,        -EAGAIN         }, */
-        { NFSERR_ACCES,         -EACCES         },
-        { NFSERR_EXIST,         -EEXIST         },
-        { NFSERR_XDEV,          -EXDEV          },
-        { NFSERR_NODEV,         -ENODEV         },
-        { NFSERR_NOTDIR,        -ENOTDIR        },
-        { NFSERR_ISDIR,         -EISDIR         },
-        { NFSERR_INVAL,         -EINVAL         },
-        { NFSERR_FBIG,          -EFBIG          },
-        { NFSERR_NOSPC,         -ENOSPC         },
-        { NFSERR_ROFS,          -EROFS          },
-        { NFSERR_MLINK,         -EMLINK         },
-        { NFSERR_NAMETOOLONG,   -ENAMETOOLONG   },
-        { NFSERR_NOTEMPTY,      -ENOTEMPTY      },
-        { NFSERR_DQUOT,         -EDQUOT         },
-        { NFSERR_STALE,         -ESTALE         },
-        { NFSERR_REMOTE,        -EREMOTE        },
-#ifdef EWFLUSH
-        { NFSERR_WFLUSH,        -EWFLUSH        },
-#endif
-        { NFSERR_BADHANDLE,     -EBADHANDLE     },
-        { NFSERR_NOT_SYNC,      -ENOTSYNC       },
-        { NFSERR_BAD_COOKIE,    -EBADCOOKIE     },
-        { NFSERR_NOTSUPP,       -ENOTSUPP       },
-        { NFSERR_TOOSMALL,      -ETOOSMALL      },
-        { NFSERR_SERVERFAULT,   -EREMOTEIO      },
-        { NFSERR_BADTYPE,       -EBADTYPE       },
-        { NFSERR_JUKEBOX,       -EJUKEBOX       },
-        { -1,                   -EIO            }
-};
-
-/**
- * nfs3_stat_to_errno - convert an NFS status code to a local errno
- * @status: NFS status code to convert
- *
- * Returns a local errno value, or -EIO if the NFS status code is
- * not recognized.  This function is used jointly by NFSv2 and NFSv3.
- */
-static int nfs3_stat_to_errno(enum nfs_stat status)
-{
-        int i;
-
-        for (i = 0; nfs_errtbl[i].stat != -1; i++) {
-                if (nfs_errtbl[i].stat == (int)status)
-                        return nfs_errtbl[i].errno;
-        }
-        dprintk("NFS: Unrecognized nfs status value: %u\n", status);
-        return nfs_errtbl[i].errno;
-}
-
-
 #define PROC(proc, argtype, restype, timer)                             \
 [NFS3PROC_##proc] = {                                                   \
         .p_proc      = NFS3PROC_##proc,                                 \
@@ -2509,7 +2461,7 @@ struct rpc_procinfo	nfs3_procedures[] = {
         PROC(COMMIT,            commit,         commit,         5),
 };
 
-const struct rpc_version nfs_version3 = {
+struct rpc_version              nfs_version3 = {
         .number                 = 3,
         .nrprocs                = ARRAY_SIZE(nfs3_procedures),
         .procs                  = nfs3_procedures
@@ -2537,7 +2489,7 @@ static struct rpc_procinfo	nfs3_acl_procedures[] = {
         },
 };
 
-const struct rpc_version nfsacl_version3 = {
+struct rpc_version              nfsacl_version3 = {
         .number                 = 3,
         .nrprocs                = sizeof(nfs3_acl_procedures)/
                                   sizeof(nfs3_acl_procedures[0]),