Commit 6407fbb9 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

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: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent f7a67b46

fs/ceph/caps.c

+5 −4
Original line number Diff line number Diff line
@@ -1968,8 +1968,8 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, 
		}

	}



	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 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, 
	    (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);

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

fs/ceph/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -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);