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

Commit 09561a53 authored by Al Viro's avatar Al Viro
Browse files

lustre: use %p[dD] 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 74d01958

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

+9 −10
Original line number Diff line number Diff line
@@ -151,10 +151,10 @@ static int ll_ddelete(const struct dentry *de) 
{

	LASSERT(de);



	CDEBUG(D_DENTRY, "%s dentry %.*s (%p, parent %p, inode %p) %s%s\n",

	CDEBUG(D_DENTRY, "%s dentry %pd (%p, parent %p, inode %p) %s%s\n",

	       d_lustre_invalid((struct dentry *)de) ? "deleting" : "keeping",

	       de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,

	       d_unhashed((struct dentry *)de) ? "" : "hashed,",

	       de, de, de->d_parent, de->d_inode,

	       d_unhashed(de) ? "" : "hashed,",

	       list_empty(&de->d_subdirs) ? "" : "subdirs");



	/* kernel >= 2.6.38 last refcount is decreased after this function. */
@@ -180,8 +180,8 @@ int ll_d_init(struct dentry *de) 
{

	LASSERT(de != NULL);



	CDEBUG(D_DENTRY, "ldd on dentry %.*s (%p) parent %p inode %p refc %d\n",

		de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,

	CDEBUG(D_DENTRY, "ldd on dentry %pd (%p) parent %p inode %p refc %d\n",

		de, de, de->d_parent, de->d_inode,

		d_count(de));



	if (de->d_fsdata == NULL) {
@@ -259,9 +259,8 @@ void ll_invalidate_aliases(struct inode *inode) 


	ll_lock_dcache(inode);

	ll_d_hlist_for_each_entry(dentry, p, &inode->i_dentry, d_u.d_alias) {

		CDEBUG(D_DENTRY, "dentry in drop %.*s (%p) parent %p "

		       "inode %p flags %d\n", dentry->d_name.len,

		       dentry->d_name.name, dentry, dentry->d_parent,

		CDEBUG(D_DENTRY, "dentry in drop %pd (%p) parent %p "

		       "inode %p flags %d\n", dentry, dentry, dentry->d_parent,

		       dentry->d_inode, dentry->d_flags);



		if (unlikely(dentry == dentry->d_sb->s_root)) {
@@ -352,8 +351,8 @@ static int ll_revalidate_nd(struct dentry *dentry, unsigned int flags) 
{

	int rc;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%s, flags=%u\n",

	       dentry->d_name.name, flags);

	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, flags=%u\n",

	       dentry, flags);



	rc = ll_revalidate_dentry(dentry, flags);

	return rc;

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

+4 −4
Original line number Diff line number Diff line
@@ -1166,9 +1166,9 @@ out: 
	/* If any bit been read/written (result != 0), we just return

	 * short read/write instead of restart io. */

	if ((result == 0 || result == -ENODATA) && io->ci_need_restart) {

		CDEBUG(D_VFSTRACE, "Restart %s on %s from %lld, count:%zd\n",

		CDEBUG(D_VFSTRACE, "Restart %s on %pD from %lld, count:%zd\n",

		       iot == CIT_READ ? "read" : "write",

		       file->f_dentry->d_name.name, *ppos, count);

		       file, *ppos, count);

		LASSERTF(io->ci_nob == 0, "%zd", io->ci_nob);

		goto restart;

	}
@@ -2899,8 +2899,8 @@ static int __ll_inode_revalidate(struct dentry *dentry, __u64 ibits) 


	LASSERT(inode != NULL);



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

	       inode->i_ino, inode->i_generation, inode, dentry->d_name.name);

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

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



	exp = ll_i2mdexp(inode);

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

+2 −2
Original line number Diff line number Diff line
@@ -1489,8 +1489,8 @@ static inline void __d_lustre_invalidate(struct dentry *dentry) 
 */

static inline void d_lustre_invalidate(struct dentry *dentry, int nested)

{

	CDEBUG(D_DENTRY, "invalidate dentry %.*s (%p) parent %p inode %p "

	       "refc %d\n", dentry->d_name.len, dentry->d_name.name, dentry,

	CDEBUG(D_DENTRY, "invalidate dentry %pd (%p) parent %p inode %p "

	       "refc %d\n", dentry, dentry,

	       dentry->d_parent, dentry->d_inode, d_count(dentry));



	spin_lock_nested(&dentry->d_lock,

drivers/staging/lustre/lustre/llite/llite_lib.c

+2 −4
Original line number Diff line number Diff line
@@ -698,10 +698,8 @@ void lustre_dump_dentry(struct dentry *dentry, int recur) 
	list_for_each(tmp, &dentry->d_subdirs)

		subdirs++;



	CERROR("dentry %p dump: name=%.*s parent=%.*s (%p), inode=%p, count=%u,"

	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry,

	       dentry->d_name.len, dentry->d_name.name,

	       dentry->d_parent->d_name.len, dentry->d_parent->d_name.name,

	CERROR("dentry %p dump: name=%pd parent=%p, inode=%p, count=%u,"

	       " flags=0x%x, fsdata=%p, %d subdirs\n", dentry, dentry,

	       dentry->d_parent, dentry->d_inode, d_count(dentry),

	       dentry->d_flags, dentry->d_fsdata, subdirs);

	if (dentry->d_inode != NULL)

drivers/staging/lustre/lustre/llite/namei.c

+12 −12
Original line number Diff line number Diff line
@@ -509,8 +509,8 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, 
	if (dentry->d_name.len > ll_i2sbi(parent)->ll_namelen)

		return ERR_PTR(-ENAMETOOLONG);



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),intent=%s\n",

	       dentry->d_name.len, dentry->d_name.name, parent->i_ino,

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

	       dentry, parent->i_ino,

	       parent->i_generation, parent, LL_IT2STR(it));



	if (d_mountpoint(dentry))
@@ -586,8 +586,8 @@ static struct dentry *ll_lookup_nd(struct inode *parent, struct dentry *dentry, 
	struct lookup_intent *itp, it = { .it_op = IT_GETATTR };

	struct dentry *de;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),flags=%u\n",

	       dentry->d_name.len, dentry->d_name.name, parent->i_ino,

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

	       dentry, parent->i_ino,

	       parent->i_generation, parent, flags);



	/* Optimize away (CREATE && !OPEN). Let .create handle the race. */
@@ -619,9 +619,9 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry, 
	long long lookup_flags = LOOKUP_OPEN;

	int rc = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),file %p,"

	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p),file %p,"

			   "open_flags %x,mode %x opened %d\n",

	       dentry->d_name.len, dentry->d_name.name, dir->i_ino,

	       dentry, dir->i_ino,

	       dir->i_generation, dir, file, open_flags, mode, *opened);



	it = kzalloc(sizeof(*it), GFP_NOFS);
@@ -741,8 +741,8 @@ static int ll_create_it(struct inode *dir, struct dentry *dentry, int mode, 
	struct inode *inode;

	int rc = 0;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),intent=%s\n",

	       dentry->d_name.len, dentry->d_name.name, dir->i_ino,

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

	       dentry, dir->i_ino,

	       dir->i_generation, dir, LL_IT2STR(it));



	rc = it_open_error(DISP_OPEN_CREATE, it);
@@ -863,17 +863,17 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry, 
{

	int rc;



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p),"

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

			   "flags=%u, excl=%d\n",

	       dentry->d_name.len, dentry->d_name.name, dir->i_ino,

	       dentry, dir->i_ino,

	       dir->i_generation, dir, mode, want_excl);



	rc = ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry);



	ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1);



	CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, unhashed %d\n",

	       dentry->d_name.len, dentry->d_name.name, d_unhashed(dentry));

	CDEBUG(D_VFSTRACE, "VFS Op:name=%pd, unhashed %d\n",

	       dentry, d_unhashed(dentry));



	return rc;

}