assorted conversions to %p[dD]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 14 insertions, 22 deletions

diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
index e12f189d539b..7f8e83f9d74e 100644
--- a/fs/cachefiles/namei.c
+++ b/fs/cachefiles/namei.c
@@ -102,8 +102,7 @@ static void cachefiles_mark_object_buried(struct cachefiles_cache *cache,
         struct cachefiles_object *object;
         struct rb_node *p;
 
-        _enter(",'%*.*s'",
-               dentry->d_name.len, dentry->d_name.len, dentry->d_name.name);
+        _enter(",'%pd'", dentry);
 
         write_lock(&cache->active_lock);
 
@@ -273,9 +272,7 @@ static int cachefiles_bury_object(struct cachefiles_cache *cache,
         char nbuffer[8 + 8 + 1];
         int ret;
 
-        _enter(",'%*.*s','%*.*s'",
-               dir->d_name.len, dir->d_name.len, dir->d_name.name,
-               rep->d_name.len, rep->d_name.len, rep->d_name.name);
+        _enter(",'%pd','%pd'", dir, rep);
 
         _debug("remove %p from %p", rep, dir);
 
@@ -597,8 +594,7 @@ lookup_again:
         /* if we've found that the terminal object exists, then we need to
          * check its attributes and delete it if it's out of date */
         if (!object->new) {
-                _debug("validate '%*.*s'",
-                       next->d_name.len, next->d_name.len, next->d_name.name);
+                _debug("validate '%pd'", next);
 
                 ret = cachefiles_check_object_xattr(object, auxdata);
                 if (ret == -ESTALE) {
@@ -827,8 +823,8 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache,
         unsigned long start;
         int ret;
 
-        //_enter(",%*.*s/,%s",
-        //       dir->d_name.len, dir->d_name.len, dir->d_name.name, filename);
+        //_enter(",%pd/,%s",
+        //       dir, filename);
 
         /* look up the victim */
         mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
@@ -910,8 +906,7 @@ int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir,
         struct dentry *victim;
         int ret;
 
-        _enter(",%*.*s/,%s",
-               dir->d_name.len, dir->d_name.len, dir->d_name.name, filename);
+        _enter(",%pd/,%s", dir, filename);
 
         victim = cachefiles_check_active(cache, dir, filename);
         if (IS_ERR(victim))
@@ -969,8 +964,8 @@ int cachefiles_check_in_use(struct cachefiles_cache *cache, struct dentry *dir,
 {
         struct dentry *victim;
 
-        //_enter(",%*.*s/,%s",
-        //       dir->d_name.len, dir->d_name.len, dir->d_name.name, filename);
+        //_enter(",%pd/,%s",
+        //       dir, filename);
 
         victim = cachefiles_check_active(cache, dir, filename);
         if (IS_ERR(victim))
diff --git a/fs/cachefiles/xattr.c b/fs/cachefiles/xattr.c
index acbc1f094fb1..a8a68745e11d 100644
--- a/fs/cachefiles/xattr.c
+++ b/fs/cachefiles/xattr.c
@@ -51,9 +51,8 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
         }
 
         if (ret != -EEXIST) {
-                pr_err("Can't set xattr on %*.*s [%lu] (err %d)\n",
-                       dentry->d_name.len, dentry->d_name.len,
-                       dentry->d_name.name, dentry->d_inode->i_ino,
+                pr_err("Can't set xattr on %pd [%lu] (err %d)\n",
+                       dentry, dentry->d_inode->i_ino,
                        -ret);
                 goto error;
         }
@@ -64,9 +63,8 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
                 if (ret == -ERANGE)
                         goto bad_type_length;
 
-                pr_err("Can't read xattr on %*.*s [%lu] (err %d)\n",
-                       dentry->d_name.len, dentry->d_name.len,
-                       dentry->d_name.name, dentry->d_inode->i_ino,
+                pr_err("Can't read xattr on %pd [%lu] (err %d)\n",
+                       dentry, dentry->d_inode->i_ino,
                        -ret);
                 goto error;
         }
@@ -92,9 +90,8 @@ bad_type_length:
 
 bad_type:
         xtype[2] = 0;
-        pr_err("Cache object %*.*s [%lu] type %s not %s\n",
-               dentry->d_name.len, dentry->d_name.len,
-               dentry->d_name.name, dentry->d_inode->i_ino,
+        pr_err("Cache object %pd [%lu] type %s not %s\n",
+               dentry, dentry->d_inode->i_ino,
                xtype, type);
         ret = -EIO;
         goto error;