[PATCH] NFS: Add debugging code to NFSv4 readdir

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 23 insertions, 0 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0ddc20102d46..1b76f80aedb9 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1722,6 +1722,10 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
         };
         int                     status;
 
+        dprintk("%s: dentry = %s/%s, cookie = %Lu\n", __FUNCTION__,
+                        dentry->d_parent->d_name.name,
+                        dentry->d_name.name,
+                        (unsigned long long)cookie);
         lock_kernel();
         nfs4_setup_readdir(cookie, NFS_COOKIEVERF(dir), dentry, &args);
         res.pgbase = args.pgbase;
@@ -1729,6 +1733,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
         if (status == 0)
                 memcpy(NFS_COOKIEVERF(dir), res.verifier.data, NFS4_VERIFIER_SIZE);
         unlock_kernel();
+        dprintk("%s: returns %d\n", __FUNCTION__, status);
         return status;
 }
 
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 577b4429c8f6..6c564ef9489e 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1035,6 +1035,13 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
                 attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;
         WRITE32(attrs[0] & readdir->bitmask[0]);
         WRITE32(attrs[1] & readdir->bitmask[1]);
+        dprintk("%s: cookie = %Lu, verifier = 0x%x%x, bitmap = 0x%x%x\n",
+                        __FUNCTION__,
+                        (unsigned long long)readdir->cookie,
+                        ((u32 *)readdir->verifier.data)[0],
+                        ((u32 *)readdir->verifier.data)[1],
+                        attrs[0] & readdir->bitmask[0],
+                        attrs[1] & readdir->bitmask[1]);
 
         /* set up reply kvec
          *    toplevel_status + taglen + rescount + OP_PUTFH + status
@@ -1043,6 +1050,9 @@ static int encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg
         replen = (RPC_REPHDRSIZE + auth->au_rslack + 9) << 2;
         xdr_inline_pages(&req->rq_rcv_buf, replen, readdir->pages,
                          readdir->pgbase, readdir->count);
+        dprintk("%s: inlined page args = (%u, %p, %u, %u)\n",
+                        __FUNCTION__, replen, readdir->pages,
+                        readdir->pgbase, readdir->count);
 
         return 0;
 }
@@ -3066,6 +3076,11 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
                 return status;
         READ_BUF(8);
         COPYMEM(readdir->verifier.data, 8);
+        dprintk("%s: verifier = 0x%x%x\n",
+                        __FUNCTION__,
+                        ((u32 *)readdir->verifier.data)[0],
+                        ((u32 *)readdir->verifier.data)[1]);
+
 
         hdrlen = (char *) p - (char *) iov->iov_base;
         recvd = rcvbuf->len - hdrlen;
@@ -3080,12 +3095,14 @@ static int decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct n
         for (nr = 0; *p++; nr++) {
                 if (p + 3 > end)
                         goto short_pkt;
+                dprintk("cookie = %Lu, ", *((unsigned long long *)p));
                 p += 2;                 /* cookie */
                 len = ntohl(*p++);      /* filename length */
                 if (len > NFS4_MAXNAMLEN) {
                         printk(KERN_WARNING "NFS: giant filename in readdir (len 0x%x)\n", len);
                         goto err_unmap;
                 }
+                dprintk("filename = %*s\n", len, (char *)p);
                 p += XDR_QUADLEN(len);
                 if (p + 1 > end)
                         goto short_pkt;
@@ -3105,6 +3122,7 @@ out:
         kunmap_atomic(kaddr, KM_USER0);
         return 0;
 short_pkt:
+        dprintk("%s: short packet at entry %d\n", __FUNCTION__, nr);
         entry[0] = entry[1] = 0;
         /* truncate listing ? */
         if (!nr) {