kclient: better readdir debug output

diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 8942165aab51447e916330c47f2bcb5408cba9cf..d93a6f07c8686d0234583a17ecd402d042e79316 100644 (file)
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -66,7 +66,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
                ceph_i_set(inode, CEPH_I_READDIR);
 
 more:
-       dout(5, "readdir filp %p at frag %u off %u\n", filp, frag, off);
+       dout(5, "readdir %p filp %p frag %u off %u\n", inode, filp, frag, off);
 
        /* do we have the correct frag content buffered? */
        if (fi->frag != frag || off < fi->off || fi->last_readdir == NULL) {
@@ -207,7 +207,7 @@ more:
        }
        spin_unlock(&inode->i_lock);
 
-       dout(20, "readdir done.\n");
+       dout(20, "readdir %p filp %p done.\n", inode, filp);
        return 0;
 }
 

diff --git a/src/kernel/file.c b/src/kernel/file.c
index 461d2c74ab52d517a73d61192380420adc114804..11498a7db7597d5a7e44dd2a8dfda49f11dac2e0 100644 (file)
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -53,7 +53,8 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
        switch (inode->i_mode & S_IFMT) {
        case S_IFREG:
        case S_IFDIR:
-               dout(20, "init_file %p 0%o (regular)\n", inode, inode->i_mode);
+               dout(20, "init_file %p %p 0%o (regular)\n", inode, file,
+                    inode->i_mode);
                cf = kzalloc(sizeof(*cf), GFP_NOFS);
                if (cf == NULL) {
                        ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
@@ -65,12 +66,14 @@ static int ceph_init_file(struct inode *inode, struct file *file, int fmode)
                break;
 
        case S_IFLNK:
-               dout(20, "init_file %p 0%o (symlink)\n", inode, inode->i_mode);
+               dout(20, "init_file %p %p 0%o (symlink)\n", inode, file,
+                    inode->i_mode);
                ceph_put_fmode(ceph_inode(inode), fmode); /* clean up */
                break;
 
        default:
-               dout(20, "init_file %p 0%o (special)\n", inode, inode->i_mode);
+               dout(20, "init_file %p %p 0%o (special)\n", inode, file,
+                    inode->i_mode);
                /*
                 * we need to drop the open ref now, since we don't
                 * have .release set to ceph_release.