ceph: print inode numbers instead of pointer values

We have a lot of log messages that print inode pointer values. This is
of dubious utility. Switch a random assortment of the ones I've found
most useful to use ceph_vinop to print the snap:inum tuple instead.

[ idryomov: use . as a separator, break unnecessarily long lines ]

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 8f537f1d9d1d3417e8dd627c50fc957592b65342..159c7bae7a9f319672a1341c36c813114eb81c18 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1968,8 +1968,8 @@ retry:
                }
        }
 
-       dout("check_caps %p file_want %s used %s dirty %s flushing %s"
-            " issued %s revoking %s retain %s %s%s\n", inode,
+       dout("check_caps %llx.%llx file_want %s used %s dirty %s flushing %s"
+            " issued %s revoking %s retain %s %s%s\n", ceph_vinop(inode),
             ceph_cap_string(file_wanted),
             ceph_cap_string(used), ceph_cap_string(ci->i_dirty_caps),
             ceph_cap_string(ci->i_flushing_caps),
@@ -1990,7 +1990,8 @@ retry:
            (revoking & (CEPH_CAP_FILE_CACHE|
                         CEPH_CAP_FILE_LAZYIO)) && /*  or revoking cache */
            !tried_invalidate) {
-               dout("check_caps trying to invalidate on %p\n", inode);
+               dout("check_caps trying to invalidate on %llx.%llx\n",
+                    ceph_vinop(inode));
                if (try_nonblocking_invalidate(inode) < 0) {
                        dout("check_caps queuing invalidate\n");
                        queue_invalidate = true;
@@ -4315,7 +4316,7 @@ static void flush_dirty_session_caps(struct ceph_mds_session *s)
                                      i_dirty_item);
                inode = &ci->vfs_inode;
                ihold(inode);
-               dout("flush_dirty_caps %p\n", inode);
+               dout("flush_dirty_caps %llx.%llx\n", ceph_vinop(inode));
                spin_unlock(&mdsc->cap_dirty_lock);
                ceph_check_caps(ci, CHECK_CAPS_FLUSH, NULL);
                iput(inode);

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index e61018d9764ee221ec5ee396f45ec01277211c8d..b18dd403aa38f3c338fa6cff912d0574a2f0f67f 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -556,7 +556,7 @@ static void ceph_async_create_cb(struct ceph_mds_client *mdsc,
                }
                ceph_kick_flushing_inode_caps(req->r_session, ci);
                spin_unlock(&ci->i_ceph_lock);
-       } else {
+       } else if (!result) {
                pr_warn("%s: no req->r_target_inode for 0x%llx\n", __func__,
                        req->r_deleg_ino);
        }

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 1c7574105478fb9ca167b6ab1842fdfaf6daca63..d8d07e68dd4fa3d490442d7808cd613038c5b5ca 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1848,8 +1848,8 @@ static void ceph_do_invalidate_pages(struct inode *inode)
        mutex_lock(&ci->i_truncate_mutex);
 
        if (READ_ONCE(fsc->mount_state) >= CEPH_MOUNT_SHUTDOWN) {
-               pr_warn_ratelimited("invalidate_pages %p %lld forced umount\n",
-                                   inode, ceph_ino(inode));
+               pr_warn_ratelimited("%s: inode %llx.%llx is shut down\n",
+                                   __func__, ceph_vinop(inode));
                mapping_set_error(inode->i_mapping, -EIO);
                truncate_pagecache(inode, 0);
                mutex_unlock(&ci->i_truncate_mutex);
@@ -1871,7 +1871,8 @@ static void ceph_do_invalidate_pages(struct inode *inode)
 
        ceph_fscache_invalidate(inode);
        if (invalidate_inode_pages2(inode->i_mapping) < 0) {
-               pr_err("invalidate_pages %p fails\n", inode);
+               pr_err("invalidate_inode_pages2 %llx.%llx failed\n",
+                      ceph_vinop(inode));
        }
 
        spin_lock(&ci->i_ceph_lock);