aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs2xdr.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs2xdr.c')
-rw-r--r--fs/nfs/nfs2xdr.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index c5fce7567200..1c570948fc16 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -271,7 +271,7 @@ nfs_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res)
271 res->eof = 0; 271 res->eof = 0;
272 hdrlen = (u8 *) p - (u8 *) iov->iov_base; 272 hdrlen = (u8 *) p - (u8 *) iov->iov_base;
273 if (iov->iov_len < hdrlen) { 273 if (iov->iov_len < hdrlen) {
274 printk(KERN_WARNING "NFS: READ reply header overflowed:" 274 dprintk("NFS: READ reply header overflowed:"
275 "length %d > %Zu\n", hdrlen, iov->iov_len); 275 "length %d > %Zu\n", hdrlen, iov->iov_len);
276 return -errno_NFSERR_IO; 276 return -errno_NFSERR_IO;
277 } else if (iov->iov_len != hdrlen) { 277 } else if (iov->iov_len != hdrlen) {
@@ -281,7 +281,7 @@ nfs_xdr_readres(struct rpc_rqst *req, __be32 *p, struct nfs_readres *res)
281 281
282 recvd = req->rq_rcv_buf.len - hdrlen; 282 recvd = req->rq_rcv_buf.len - hdrlen;
283 if (count > recvd) { 283 if (count > recvd) {
284 printk(KERN_WARNING "NFS: server cheating in read reply: " 284 dprintk("NFS: server cheating in read reply: "
285 "count %d > recvd %d\n", count, recvd); 285 "count %d > recvd %d\n", count, recvd);
286 count = recvd; 286 count = recvd;
287 } 287 }
@@ -431,7 +431,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy)
431 431
432 hdrlen = (u8 *) p - (u8 *) iov->iov_base; 432 hdrlen = (u8 *) p - (u8 *) iov->iov_base;
433 if (iov->iov_len < hdrlen) { 433 if (iov->iov_len < hdrlen) {
434 printk(KERN_WARNING "NFS: READDIR reply header overflowed:" 434 dprintk("NFS: READDIR reply header overflowed:"
435 "length %d > %Zu\n", hdrlen, iov->iov_len); 435 "length %d > %Zu\n", hdrlen, iov->iov_len);
436 return -errno_NFSERR_IO; 436 return -errno_NFSERR_IO;
437 } else if (iov->iov_len != hdrlen) { 437 } else if (iov->iov_len != hdrlen) {
@@ -454,7 +454,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy)
454 len = ntohl(*p++); 454 len = ntohl(*p++);
455 p += XDR_QUADLEN(len) + 1; /* name plus cookie */ 455 p += XDR_QUADLEN(len) + 1; /* name plus cookie */
456 if (len > NFS2_MAXNAMLEN) { 456 if (len > NFS2_MAXNAMLEN) {
457 printk(KERN_WARNING "NFS: giant filename in readdir (len 0x%x)!\n", 457 dprintk("NFS: giant filename in readdir (len 0x%x)!\n",
458 len); 458 len);
459 goto err_unmap; 459 goto err_unmap;
460 } 460 }
@@ -471,7 +471,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy)
471 entry[0] = entry[1] = 0; 471 entry[0] = entry[1] = 0;
472 /* truncate listing ? */ 472 /* truncate listing ? */
473 if (!nr) { 473 if (!nr) {
474 printk(KERN_NOTICE "NFS: readdir reply truncated!\n"); 474 dprintk("NFS: readdir reply truncated!\n");
475 entry[1] = 1; 475 entry[1] = 1;
476 } 476 }
477 goto out; 477 goto out;
@@ -583,12 +583,12 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy)
583 /* Convert length of symlink */ 583 /* Convert length of symlink */
584 len = ntohl(*p++); 584 len = ntohl(*p++);
585 if (len >= rcvbuf->page_len || len <= 0) { 585 if (len >= rcvbuf->page_len || len <= 0) {
586 dprintk(KERN_WARNING "nfs: server returned giant symlink!\n"); 586 dprintk("nfs: server returned giant symlink!\n");
587 return -ENAMETOOLONG; 587 return -ENAMETOOLONG;
588 } 588 }
589 hdrlen = (u8 *) p - (u8 *) iov->iov_base; 589 hdrlen = (u8 *) p - (u8 *) iov->iov_base;
590 if (iov->iov_len < hdrlen) { 590 if (iov->iov_len < hdrlen) {
591 printk(KERN_WARNING "NFS: READLINK reply header overflowed:" 591 dprintk("NFS: READLINK reply header overflowed:"
592 "length %d > %Zu\n", hdrlen, iov->iov_len); 592 "length %d > %Zu\n", hdrlen, iov->iov_len);
593 return -errno_NFSERR_IO; 593 return -errno_NFSERR_IO;
594 } else if (iov->iov_len != hdrlen) { 594 } else if (iov->iov_len != hdrlen) {
@@ -597,7 +597,7 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy)
597 } 597 }
598 recvd = req->rq_rcv_buf.len - hdrlen; 598 recvd = req->rq_rcv_buf.len - hdrlen;
599 if (recvd < len) { 599 if (recvd < len) {
600 printk(KERN_WARNING "NFS: server cheating in readlink reply: " 600 dprintk("NFS: server cheating in readlink reply: "
601 "count %u > recvd %u\n", len, recvd); 601 "count %u > recvd %u\n", len, recvd);
602 return -EIO; 602 return -EIO;
603 } 603 }
@@ -695,7 +695,7 @@ nfs_stat_to_errno(int stat)
695 if (nfs_errtbl[i].stat == stat) 695 if (nfs_errtbl[i].stat == stat)
696 return nfs_errtbl[i].errno; 696 return nfs_errtbl[i].errno;
697 } 697 }
698 printk(KERN_ERR "nfs_stat_to_errno: bad nfs status return value: %d\n", stat); 698 dprintk("nfs_stat_to_errno: bad nfs status return value: %d\n", stat);
699 return nfs_errtbl[i].errno; 699 return nfs_errtbl[i].errno;
700} 700}
701 701