ceph: print inode number in __caps_issued_mask debugging messages [Linux 5.2]

ceph: print inode number in __caps_issued_mask debugging messages [Linux 5.2]

This Linux kernel change "ceph: print inode number in __caps_issued_mask debugging messages" is included in the Linux 5.2 release. This change is authored by Jeff Layton <jlayton [at] kernel.org> on Tue Apr 23 13:40:02 2019 -0400. The commit for this change in Linux stable tree is 5ddc61f (patch).

ceph: print inode number in __caps_issued_mask debugging messages

To make it easier to correlate with MDS logs.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

There are 12 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 fs/ceph/caps.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 9e0b464..72f8e13 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -892,8 +892,8 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)
    int have = ci->i_snap_caps;

    if ((have & mask) == mask) {
-       dout("__ceph_caps_issued_mask %p snap issued %s"
-            " (mask %s)\n", &ci->vfs_inode,
+       dout("__ceph_caps_issued_mask ino 0x%lx snap issued %s"
+            " (mask %s)\n", ci->vfs_inode.i_ino,
             ceph_cap_string(have),
             ceph_cap_string(mask));
        return 1;
@@ -904,8 +904,8 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)
        if (!__cap_is_valid(cap))
            continue;
        if ((cap->issued & mask) == mask) {
-           dout("__ceph_caps_issued_mask %p cap %p issued %s"
-                " (mask %s)\n", &ci->vfs_inode, cap,
+           dout("__ceph_caps_issued_mask ino 0x%lx cap %p issued %s"
+                " (mask %s)\n", ci->vfs_inode.i_ino, cap,
                 ceph_cap_string(cap->issued),
                 ceph_cap_string(mask));
            if (touch)
@@ -916,8 +916,8 @@ int __ceph_caps_issued_mask(struct ceph_inode_info *ci, int mask, int touch)
        /* does a combination of caps satisfy mask? */
        have |= cap->issued;
        if ((have & mask) == mask) {
-           dout("__ceph_caps_issued_mask %p combo issued %s"
-                " (mask %s)\n", &ci->vfs_inode,
+           dout("__ceph_caps_issued_mask ino 0x%lx combo issued %s"
+                " (mask %s)\n", ci->vfs_inode.i_ino,
                 ceph_cap_string(cap->issued),
                 ceph_cap_string(mask));
            if (touch) {

Leave a Reply

Your email address will not be published. Required fields are marked *