1 files changed, 14 insertions, 11 deletions

diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c
index d9e08f0cf2a0..616d3267b7e7 100644
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
@@ -346,6 +346,7 @@ nfs3_xdr_readargs(struct rpc_rqst *req, __be32 *p, struct nfs_readargs *args)
         replen = (RPC_REPHDRSIZE + auth->au_rslack + NFS3_readres_sz) << 2;
         xdr_inline_pages(&req->rq_rcv_buf, replen,
                          args->pages, args->pgbase, count);
+        req->rq_rcv_buf.flags |= XDRBUF_READ;
         return 0;
 }
 
@@ -367,6 +368,7 @@ nfs3_xdr_writeargs(struct rpc_rqst *req, __be32 *p, struct nfs_writeargs *args)
 
         /* Copy the page array */
         xdr_encode_pages(sndbuf, args->pages, args->pgbase, count);
+        sndbuf->flags |= XDRBUF_WRITE;
         return 0;
 }
 
@@ -524,7 +526,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res
 
         hdrlen = (u8 *) p - (u8 *) iov->iov_base;
         if (iov->iov_len < hdrlen) {
-                printk(KERN_WARNING "NFS: READDIR reply header overflowed:"
+                dprintk("NFS: READDIR reply header overflowed:"
                                 "length %d > %Zu\n", hdrlen, iov->iov_len);
                 return -errno_NFSERR_IO;
         } else if (iov->iov_len != hdrlen) {
@@ -547,7 +549,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res
                 len = ntohl(*p++);              /* string length */
                 p += XDR_QUADLEN(len) + 2;      /* name + cookie */
                 if (len > NFS3_MAXNAMLEN) {
-                        printk(KERN_WARNING "NFS: giant filename in readdir (len %x)!\n",
+                        dprintk("NFS: giant filename in readdir (len %x)!\n",
                                                 len);
                         goto err_unmap;
                 }
@@ -567,7 +569,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res
                                         goto short_pkt;
                                 len = ntohl(*p++);
                                 if (len > NFS3_FHSIZE) {
-                                        printk(KERN_WARNING "NFS: giant filehandle in "
+                                        dprintk("NFS: giant filehandle in "
                                                 "readdir (len %x)!\n", len);
                                         goto err_unmap;
                                 }
@@ -588,7 +590,7 @@ nfs3_xdr_readdirres(struct rpc_rqst *req, __be32 *p, struct nfs3_readdirres *res
         entry[0] = entry[1] = 0;
         /* truncate listing ? */
         if (!nr) {
-                printk(KERN_NOTICE "NFS: readdir reply truncated!\n");
+                dprintk("NFS: readdir reply truncated!\n");
                 entry[1] = 1;
         }
         goto out;
@@ -826,22 +828,23 @@ nfs3_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, struct nfs_fattr *fattr)
         /* Convert length of symlink */
         len = ntohl(*p++);
         if (len >= rcvbuf->page_len || len <= 0) {
-                dprintk(KERN_WARNING "nfs: server returned giant symlink!\n");
+                dprintk("nfs: server returned giant symlink!\n");
                 return -ENAMETOOLONG;
         }
 
         hdrlen = (u8 *) p - (u8 *) iov->iov_base;
         if (iov->iov_len < hdrlen) {
-                printk(KERN_WARNING "NFS: READLINK reply header overflowed:"
+                dprintk("NFS: READLINK reply header overflowed:"
                                 "length %d > %Zu\n", hdrlen, iov->iov_len);
                 return -errno_NFSERR_IO;
         } else if (iov->iov_len != hdrlen) {
-                dprintk("NFS: READLINK header is short. iovec will be shifted.\n");
+                dprintk("NFS: READLINK header is short. "
+                        "iovec will be shifted.\n");
                 xdr_shift_buf(rcvbuf, iov->iov_len - hdrlen);
         }
         recvd = req->rq_rcv_buf.len - hdrlen;
         if (recvd < len) {
-                printk(KERN_WARNING "NFS: server cheating in readlink reply: "
+                dprintk("NFS: server cheating in readlink reply: "
                                 "count %u > recvd %u\n", len, recvd);
                 return -EIO;
         }
@@ -876,13 +879,13 @@ nfs3_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res)
         ocount   = ntohl(*p++);
 
         if (ocount != count) {
-                printk(KERN_WARNING "NFS: READ count doesn't match RPC opaque count.\n");
+                dprintk("NFS: READ count doesn't match RPC opaque count.\n");
                 return -errno_NFSERR_IO;
         }
 
         hdrlen = (u8 *) p - (u8 *) iov->iov_base;
         if (iov->iov_len < hdrlen) {
-                printk(KERN_WARNING "NFS: READ reply header overflowed:"
+                dprintk("NFS: READ reply header overflowed:"
                                 "length %d > %Zu\n", hdrlen, iov->iov_len);
                 return -errno_NFSERR_IO;
         } else if (iov->iov_len != hdrlen) {
@@ -892,7 +895,7 @@ nfs3_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res)
 
         recvd = req->rq_rcv_buf.len - hdrlen;
         if (count > recvd) {
-                printk(KERN_WARNING "NFS: server cheating in read reply: "
+                dprintk("NFS: server cheating in read reply: "
                         "count %d > recvd %d\n", count, recvd);
                 count = recvd;
                 res->eof = 0;