Skip to content

Commit 6407fbb

Browse files
jtlaytonidryomov
authored andcommitted
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 <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent f7a67b4 commit 6407fbb

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

fs/ceph/caps.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,8 +1968,8 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
19681968
}
19691969
}
19701970

1971-
dout("check_caps %p file_want %s used %s dirty %s flushing %s"
1972-
" issued %s revoking %s retain %s %s%s\n", inode,
1971+
dout("check_caps %llx.%llx file_want %s used %s dirty %s flushing %s"
1972+
" issued %s revoking %s retain %s %s%s\n", ceph_vinop(inode),
19731973
ceph_cap_string(file_wanted),
19741974
ceph_cap_string(used), ceph_cap_string(ci->i_dirty_caps),
19751975
ceph_cap_string(ci->i_flushing_caps),
@@ -1990,7 +1990,8 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
19901990
(revoking & (CEPH_CAP_FILE_CACHE|
19911991
CEPH_CAP_FILE_LAZYIO)) && /* or revoking cache */
19921992
!tried_invalidate) {
1993-
dout("check_caps trying to invalidate on %p\n", inode);
1993+
dout("check_caps trying to invalidate on %llx.%llx\n",
1994+
ceph_vinop(inode));
19941995
if (try_nonblocking_invalidate(inode) < 0) {
19951996
dout("check_caps queuing invalidate\n");
19961997
queue_invalidate = true;
@@ -4315,7 +4316,7 @@ static void flush_dirty_session_caps(struct ceph_mds_session *s)
43154316
i_dirty_item);
43164317
inode = &ci->vfs_inode;
43174318
ihold(inode);
4318-
dout("flush_dirty_caps %p\n", inode);
4319+
dout("flush_dirty_caps %llx.%llx\n", ceph_vinop(inode));
43194320
spin_unlock(&mdsc->cap_dirty_lock);
43204321
ceph_check_caps(ci, CHECK_CAPS_FLUSH, NULL);
43214322
iput(inode);

fs/ceph/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ static void ceph_async_create_cb(struct ceph_mds_client *mdsc,
556556
}
557557
ceph_kick_flushing_inode_caps(req->r_session, ci);
558558
spin_unlock(&ci->i_ceph_lock);
559-
} else {
559+
} else if (!result) {
560560
pr_warn("%s: no req->r_target_inode for 0x%llx\n", __func__,
561561
req->r_deleg_ino);
562562
}

fs/ceph/inode.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,8 +1848,8 @@ static void ceph_do_invalidate_pages(struct inode *inode)
18481848
mutex_lock(&ci->i_truncate_mutex);
18491849

18501850
if (READ_ONCE(fsc->mount_state) >= CEPH_MOUNT_SHUTDOWN) {
1851-
pr_warn_ratelimited("invalidate_pages %p %lld forced umount\n",
1852-
inode, ceph_ino(inode));
1851+
pr_warn_ratelimited("%s: inode %llx.%llx is shut down\n",
1852+
__func__, ceph_vinop(inode));
18531853
mapping_set_error(inode->i_mapping, -EIO);
18541854
truncate_pagecache(inode, 0);
18551855
mutex_unlock(&ci->i_truncate_mutex);
@@ -1871,7 +1871,8 @@ static void ceph_do_invalidate_pages(struct inode *inode)
18711871

18721872
ceph_fscache_invalidate(inode);
18731873
if (invalidate_inode_pages2(inode->i_mapping) < 0) {
1874-
pr_err("invalidate_pages %p fails\n", inode);
1874+
pr_err("invalidate_inode_pages2 %llx.%llx failed\n",
1875+
ceph_vinop(inode));
18751876
}
18761877

18771878
spin_lock(&ci->i_ceph_lock);

0 commit comments

Comments
 (0)