| Message ID | 20190430112236.14162-1-jlayton@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ceph: print inode number in __caps_issued_mask debugging messages | expand |
On Tue, Apr 30, 2019 at 7:25 PM Jeff Layton <jlayton@kernel.org> wrote: > > To make it easier to correlate with MDS logs. > > Signed-off-by: Jeff Layton <jlayton@kernel.org> > --- > 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 9e0b464d374f..72f8e1311392 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) { > -- Reviewed-by: "Yan, Zheng" <zyan@redhat.com> > 2.20.1 >
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 9e0b464d374f..72f8e1311392 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) {
To make it easier to correlate with MDS logs. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/ceph/caps.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)