Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97a075cd authored by James Nunez's avatar James Nunez Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: Replace printing of i_ino with ll_inode2fid() 



The printing of i_ino/i_generation in llite messages is not nearly so
useful as printing the full inode FID, since i_ino is a "compressed"
version of the FID and there may be duplicate values for i_ino in some
cases (especially if running on a 32-bit client).

All instances of printing i_ino/i_generation are replaced with
the FID using ll_inode2fid(). All instances, except for one, of
printing just i_ino was replaced by printing the FID. In all
CERROR lines touched by the i_ino replacements, the device name
or fsname was added at the beginning of the message if it did not
already exist.

Signed-off-by: default avatarJames Nunez <james.a.nunez@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3491
Reviewed-on: http://review.whamcloud.com/6848


Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b97fa87f

drivers/staging/lustre/lustre/llite/dcache.c

+4 −4
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ void ll_invalidate_aliases(struct inode *inode) 
{

	struct dentry *dentry;



	CDEBUG(D_INODE, "marking dentries for ino %lu/%u(%p) invalid\n",

	       inode->i_ino, inode->i_generation, inode);

	CDEBUG(D_INODE, "marking dentries for ino "DFID"(%p) invalid\n",

	       PFID(ll_inode2fid(inode)), inode);



	ll_lock_dcache(inode);

	hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
@@ -286,8 +286,8 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct inode *inode) 
	if (it->d.lustre.it_lock_mode && inode) {

		struct ll_sb_info *sbi = ll_i2sbi(inode);



		CDEBUG(D_DLMTRACE, "setting l_data to inode %p (%lu/%u)\n",

		       inode, inode->i_ino, inode->i_generation);

		CDEBUG(D_DLMTRACE, "setting l_data to inode "DFID"(%p)\n",

		       PFID(ll_inode2fid(inode)), inode);

		ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL);

	}

drivers/staging/lustre/lustre/llite/dir.c

+11 −12
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ static int ll_dir_filler(void *_hash, struct page *page0) 
	int i;

	int rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) hash %llu\n",

	       inode->i_ino, inode->i_generation, inode, hash);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p) hash %llu\n",

	       PFID(ll_inode2fid(inode)), inode, hash);



	LASSERT(max_pages > 0 && max_pages <= MD_MAX_BRW_PAGES);
@@ -372,8 +372,8 @@ struct page *ll_get_dir_page(struct inode *dir, __u64 hash, 
			return ERR_PTR(rc);

		}



		CDEBUG(D_INODE, "setting lr_lvb_inode to inode %p (%lu/%u)\n",

		       dir, dir->i_ino, dir->i_generation);

		CDEBUG(D_INODE, "setting lr_lvb_inode to inode "DFID"(%p)\n",

		       PFID(ll_inode2fid(dir)), dir);

		md_set_lock_data(ll_i2sbi(dir)->ll_md_exp,

				 &it.d.lustre.it_lock_handle, dir, NULL);

	} else {
@@ -616,9 +616,9 @@ static int ll_readdir(struct file *filp, struct dir_context *ctx) 
	int			api32	= ll_need_32bit_api(sbi);

	int			rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p) pos %lu/%llu 32bit_api %d\n",

	       inode->i_ino, inode->i_generation,

	       inode, (unsigned long)pos, i_size_read(inode), api32);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p) pos %lu/%llu 32bit_api %d\n",

	       PFID(ll_inode2fid(inode)), inode, (unsigned long)pos,

	       i_size_read(inode), api32);



	if (pos == MDS_DIR_END_OFF) {

		/*
@@ -828,9 +828,8 @@ int ll_dir_getstripe(struct inode *inode, struct lov_mds_md **lmmp, 
	rc = md_getattr(sbi->ll_md_exp, op_data, &req);

	ll_finish_md_op_data(op_data);

	if (rc < 0) {

		CDEBUG(D_INFO, "md_getattr failed on inode %lu/%u: rc %d\n",

		       inode->i_ino,

		       inode->i_generation, rc);

		CDEBUG(D_INFO, "md_getattr failed on inode "DFID": rc %d\n",

		       PFID(ll_inode2fid(inode)), rc);

		goto out;

	}
@@ -1267,8 +1266,8 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	struct obd_ioctl_data *data;

	int rc = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), cmd=%#x\n",

	       inode->i_ino, inode->i_generation, inode, cmd);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), cmd=%#x\n",

	       PFID(ll_inode2fid(inode)), inode, cmd);



	/* asm-ppc{,64} declares TCGETS, et. al. as type 't' not 'T' */

	if (_IOC_TYPE(cmd) == 'T' || _IOC_TYPE(cmd) == 't') /* tty ioctls */

drivers/staging/lustre/lustre/llite/file.c

+36 −34
Original line number Diff line number Diff line
@@ -170,13 +170,15 @@ static int ll_close_inode_openhandle(struct obd_export *md_exp, 
		 */

		rc = ll_som_update(inode, op_data);

		if (rc) {

			CERROR("inode %lu mdc Size-on-MDS update failed: rc = %d\n",

			       inode->i_ino, rc);

			CERROR("%s: inode "DFID" mdc Size-on-MDS update failed: rc = %d\n",

			       ll_i2mdexp(inode)->exp_obd->obd_name,

			       PFID(ll_inode2fid(inode)), rc);

			rc = 0;

		}

	} else if (rc) {

		CERROR("inode %lu mdc close failed: rc = %d\n",

		       inode->i_ino, rc);

		CERROR("%s: inode "DFID" mdc close failed: rc = %d\n",

		       ll_i2mdexp(inode)->exp_obd->obd_name,

		       PFID(ll_inode2fid(inode)), rc);

	}



	/* DATA_MODIFIED flag was successfully sent on close, cancel data
@@ -343,8 +345,8 @@ int ll_file_release(struct inode *inode, struct file *file) 
	struct ll_inode_info *lli = ll_i2info(inode);

	int rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", inode->i_ino,

	       inode->i_generation, inode);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p)\n",

	       PFID(ll_inode2fid(inode)), inode);



#ifdef CONFIG_FS_POSIX_ACL

	if (sbi->ll_flags & LL_SBI_RMT_CLIENT && is_root_inode(inode)) {
@@ -543,8 +545,8 @@ int ll_file_open(struct inode *inode, struct file *file) 
	struct ll_file_data *fd;

	int rc = 0, opendir_set = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), flags %o\n", inode->i_ino,

	       inode->i_generation, inode, file->f_flags);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), flags %o\n",

	       PFID(ll_inode2fid(inode)), inode, file->f_flags);



	it = file->private_data; /* XXX: compat macro */

	file->private_data = NULL; /* prevent ll_local_open assertion */
@@ -1383,8 +1385,8 @@ int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry, 
	lsm = ccc_inode_lsm_get(inode);

	if (lsm) {

		ccc_inode_lsm_put(inode, lsm);

		CDEBUG(D_IOCTL, "stripe already exists for ino %lu\n",

		       inode->i_ino);

		CDEBUG(D_IOCTL, "stripe already exists for inode "DFID"\n",

		       PFID(ll_inode2fid(inode)));

		rc = -EEXIST;

		goto out;

	}
@@ -2248,8 +2250,8 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	struct ll_file_data	*fd = LUSTRE_FPRIVATE(file);

	int			 flags, rc;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),cmd=%x\n", inode->i_ino,

	       inode->i_generation, inode, cmd);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p),cmd=%x\n",

	       PFID(ll_inode2fid(inode)), inode, cmd);

	ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_IOCTL, 1);



	/* asm-ppc{,64} declares TCGETS, et. al. as type 't' not 'T' */
@@ -2557,9 +2559,8 @@ static loff_t ll_file_seek(struct file *file, loff_t offset, int origin) 


	retval = offset + ((origin == SEEK_END) ? i_size_read(inode) :

			   (origin == SEEK_CUR) ? file->f_pos : 0);

	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), to=%llu=%#llx(%d)\n",

	       inode->i_ino, inode->i_generation, inode, retval, retval,

	       origin);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), to=%llu=%#llx(%d)\n",

	       PFID(ll_inode2fid(inode)), inode, retval, retval, origin);

	ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_LLSEEK, 1);



	if (origin == SEEK_END || origin == SEEK_HOLE || origin == SEEK_DATA) {
@@ -2654,8 +2655,8 @@ int ll_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
	struct ptlrpc_request *req;

	int rc, err;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", inode->i_ino,

	       inode->i_generation, inode);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p)\n",

	       PFID(ll_inode2fid(inode)), inode);

	ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_FSYNC, 1);



	rc = filemap_write_and_wait_range(inode->i_mapping, start, end);
@@ -2713,8 +2714,8 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) 
	int rc;

	int rc2 = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu file_lock=%p\n",

	       inode->i_ino, file_lock);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID" file_lock=%p\n",

	       PFID(ll_inode2fid(inode)), file_lock);



	ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_FLOCK, 1);
@@ -2797,9 +2798,9 @@ ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock) 
	if (IS_ERR(op_data))

		return PTR_ERR(op_data);



	CDEBUG(D_DLMTRACE, "inode=%lu, pid=%u, flags=%#llx, mode=%u, start=%llu, end=%llu\n",

	       inode->i_ino, flock.l_flock.pid, flags, einfo.ei_mode,

	       flock.l_flock.start, flock.l_flock.end);

	CDEBUG(D_DLMTRACE, "inode="DFID", pid=%u, flags=%#llx, mode=%u, start=%llu, end=%llu\n",

	       PFID(ll_inode2fid(inode)), flock.l_flock.pid, flags,

	       einfo.ei_mode, flock.l_flock.start, flock.l_flock.end);



	rc = md_enqueue(sbi->ll_md_exp, &einfo, NULL,

			op_data, &lockh, &flock, 0, NULL /* req */, flags);
@@ -2921,8 +2922,8 @@ static int __ll_inode_revalidate(struct dentry *dentry, __u64 ibits) 
	struct obd_export *exp;

	int rc = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),name=%pd\n",

	       inode->i_ino, inode->i_generation, inode, dentry);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p),name=%pd\n",

	       PFID(ll_inode2fid(inode)), inode, dentry);



	exp = ll_i2mdexp(inode);
@@ -3144,8 +3145,8 @@ int ll_inode_permission(struct inode *inode, int mask) 
			return rc;

	}



	CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), inode mode %x mask %o\n",

	       inode->i_ino, inode->i_generation, inode, inode->i_mode, mask);

	CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), inode mode %x mask %o\n",

	       PFID(ll_inode2fid(inode)), inode, inode->i_mode, mask);



	if (ll_i2sbi(inode)->ll_flags & LL_SBI_RMT_CLIENT)

		return lustre_check_remote_perm(inode, mask);
@@ -3435,8 +3436,8 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode, 
	LASSERT(lock);

	LASSERT(ldlm_has_layout(lock));



	LDLM_DEBUG(lock, "File %p/"DFID" being reconfigured: %d",

		   inode, PFID(&lli->lli_fid), reconf);

	LDLM_DEBUG(lock, "File "DFID"(%p) being reconfigured: %d",

		   PFID(&lli->lli_fid), inode, reconf);



	/* in case this is a caching lock and reinstate with new inode */

	md_set_lock_data(sbi->ll_md_exp, &lockh->cookie, inode, NULL);
@@ -3507,9 +3508,9 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode, 


	/* wait for IO to complete if it's still being used. */

	if (wait_layout) {

		CDEBUG(D_INODE, "%s: %p/" DFID " wait for layout reconf.\n",

		CDEBUG(D_INODE, "%s: "DFID"(%p) wait for layout reconf\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

		       inode, PFID(&lli->lli_fid));

		       PFID(&lli->lli_fid), inode);



		memset(&conf, 0, sizeof(conf));

		conf.coc_opc = OBJECT_CONF_WAIT;
@@ -3518,7 +3519,8 @@ static int ll_layout_lock_set(struct lustre_handle *lockh, enum ldlm_mode mode, 
		if (rc == 0)

			rc = -EAGAIN;



		CDEBUG(D_INODE, "file: " DFID " waiting layout return: %d.\n",

		CDEBUG(D_INODE, "%s: file="DFID" waiting layout return: %d.\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

		       PFID(&lli->lli_fid), rc);

	}

	return rc;
@@ -3591,9 +3593,9 @@ int ll_layout_refresh(struct inode *inode, __u32 *gen) 
	it.it_op = IT_LAYOUT;

	lockh.cookie = 0ULL;



	LDLM_DEBUG_NOLOCK("%s: requeue layout lock for file %p/" DFID "",

			  ll_get_fsname(inode->i_sb, NULL, 0), inode,

			PFID(&lli->lli_fid));

	LDLM_DEBUG_NOLOCK("%s: requeue layout lock for file "DFID"(%p)",

			  ll_get_fsname(inode->i_sb, NULL, 0),

			  PFID(&lli->lli_fid), inode);



	rc = md_enqueue(sbi->ll_md_exp, &einfo, &it, op_data, &lockh,

			NULL, 0, NULL, 0);

drivers/staging/lustre/lustre/llite/llite_close.c

+21 −19
Original line number Diff line number Diff line
@@ -90,15 +90,15 @@ void ll_queue_done_writing(struct inode *inode, unsigned long flags) 
		struct ll_close_queue *lcq = ll_i2sbi(inode)->ll_lcq;



		if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)

			CWARN("ino %lu/%u(flags %u) som valid it just after recovery\n",

			      inode->i_ino, inode->i_generation,

			      lli->lli_flags);

			CWARN("%s: file "DFID"(flags %u) Size-on-MDS valid, done writing allowed and no diry pages\n",

			      ll_get_fsname(inode->i_sb, NULL, 0),

			      PFID(ll_inode2fid(inode)), lli->lli_flags);

		/* DONE_WRITING is allowed and inode has no dirty page. */

		spin_lock(&lcq->lcq_lock);



		LASSERT(list_empty(&lli->lli_close_list));

		CDEBUG(D_INODE, "adding inode %lu/%u to close list\n",

		       inode->i_ino, inode->i_generation);

		CDEBUG(D_INODE, "adding inode "DFID" to close list\n",

		       PFID(ll_inode2fid(inode)));

		list_add_tail(&lli->lli_close_list, &lcq->lcq_head);



		/* Avoid a concurrent insertion into the close thread queue:
@@ -124,9 +124,9 @@ void ll_done_writing_attr(struct inode *inode, struct md_op_data *op_data) 
	op_data->op_flags |= MF_SOM_CHANGE;

	/* Check if Size-on-MDS attributes are valid. */

	if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)

		CERROR("ino %lu/%u(flags %u) som valid it just after recovery\n",

		       inode->i_ino, inode->i_generation,

		       lli->lli_flags);

		CERROR("%s: inode "DFID"(flags %u) MDS holds lock on Size-on-MDS attributes\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

		       PFID(ll_inode2fid(inode)), lli->lli_flags);



	if (!cl_local_size(inode)) {

		/* Send Size-on-MDS Attributes if valid. */
@@ -221,9 +221,9 @@ int ll_som_update(struct inode *inode, struct md_op_data *op_data) 


	LASSERT(op_data);

	if (lli->lli_flags & LLIF_MDS_SIZE_LOCK)

		CERROR("ino %lu/%u(flags %u) som valid it just after recovery\n",

		       inode->i_ino, inode->i_generation,

		       lli->lli_flags);

		CERROR("%s: inode "DFID"(flags %u) MDS holds lock on Size-on-MDS attributes\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

		       PFID(ll_inode2fid(inode)), lli->lli_flags);



	oa = kmem_cache_zalloc(obdo_cachep, GFP_NOFS);

	if (!oa) {
@@ -241,9 +241,9 @@ int ll_som_update(struct inode *inode, struct md_op_data *op_data) 
		if (rc) {

			oa->o_valid = 0;

			if (rc != -ENOENT)

				CERROR("inode_getattr failed (%d): unable to send a Size-on-MDS attribute update for inode %lu/%u\n",

				       rc, inode->i_ino,

				       inode->i_generation);

				CERROR("%s: inode_getattr failed - unable to send a Size-on-MDS attribute update for inode "DFID": rc = %d\n",

				       ll_get_fsname(inode->i_sb, NULL, 0),

				       PFID(ll_inode2fid(inode)), rc);

		} else {

			CDEBUG(D_INODE, "Size-on-MDS update on "DFID"\n",

			       PFID(&lli->lli_fid));
@@ -302,9 +302,11 @@ static void ll_done_writing(struct inode *inode) 
		 * OSTs and send setattr to back to MDS.

		 */

		rc = ll_som_update(inode, op_data);

	else if (rc)

		CERROR("inode %lu mdc done_writing failed: rc = %d\n",

		       inode->i_ino, rc);

	else if (rc) {

		CERROR("%s: inode "DFID" mdc done_writing failed: rc = %d\n",

		       ll_get_fsname(inode->i_sb, NULL, 0),

		       PFID(ll_inode2fid(inode)), rc);

	}

out:

	ll_finish_md_op_data(op_data);

	if (och) {
@@ -349,8 +351,8 @@ static int ll_close_thread(void *arg) 
			break;



		inode = ll_info2i(lli);

		CDEBUG(D_INFO, "done_writing for inode %lu/%u\n",

		       inode->i_ino, inode->i_generation);

		CDEBUG(D_INFO, "done_writing for inode "DFID"\n",

		       PFID(ll_inode2fid(inode)));

		ll_done_writing(inode);

		iput(inode);

	}

drivers/staging/lustre/lustre/llite/llite_internal.h

+4 −6
Original line number Diff line number Diff line
@@ -1288,18 +1288,16 @@ static inline void ll_set_lock_data(struct obd_export *exp, struct inode *inode, 
		 */

		if (it->d.lustre.it_remote_lock_mode) {

			handle.cookie = it->d.lustre.it_remote_lock_handle;

			CDEBUG(D_DLMTRACE, "setting l_data to inode %p(%lu/%u) for remote lock %#llx\n",

			       inode,

			       inode->i_ino, inode->i_generation,

			CDEBUG(D_DLMTRACE, "setting l_data to inode "DFID"%p for remote lock %#llx\n",

			       PFID(ll_inode2fid(inode)), inode,

			       handle.cookie);

			md_set_lock_data(exp, &handle.cookie, inode, NULL);

		}



		handle.cookie = it->d.lustre.it_lock_handle;



		CDEBUG(D_DLMTRACE, "setting l_data to inode %p (%lu/%u) for lock %#llx\n",

		       inode, inode->i_ino,

		       inode->i_generation, handle.cookie);

		CDEBUG(D_DLMTRACE, "setting l_data to inode "DFID"%p for lock %#llx\n",

		       PFID(ll_inode2fid(inode)), inode, handle.cookie);



		md_set_lock_data(exp, &handle.cookie, inode,

				 &it->d.lustre.it_lock_bits);