assorted conversions to %p[dD]

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

2 files changed, 18 insertions, 35 deletions

diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
index dcdec6fd33c6..bfdbaba9c2ba 100644
--- a/fs/autofs4/expire.c
+++ b/fs/autofs4/expire.c
@@ -41,8 +41,7 @@ static int autofs4_mount_busy(struct vfsmount *mnt, struct dentry *dentry)
         struct path path = {.mnt = mnt, .dentry = dentry};
         int status = 1;
 
-        DPRINTK("dentry %p %.*s",
-                dentry, (int)dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("dentry %p %pd", dentry, dentry);
 
         path_get(&path);
 
@@ -192,8 +191,7 @@ static int autofs4_direct_busy(struct vfsmount *mnt,
                                 unsigned long timeout,
                                 int do_now)
 {
-        DPRINTK("top %p %.*s",
-                top, (int) top->d_name.len, top->d_name.name);
+        DPRINTK("top %p %pd", top, top);
 
         /* If it's busy update the expiry counters */
         if (!may_umount_tree(mnt)) {
@@ -221,8 +219,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt,
         struct autofs_info *top_ino = autofs4_dentry_ino(top);
         struct dentry *p;
 
-        DPRINTK("top %p %.*s",
-                top, (int)top->d_name.len, top->d_name.name);
+        DPRINTK("top %p %pd", top, top);
 
         /* Negative dentry - give up */
         if (!simple_positive(top))
@@ -230,8 +227,7 @@ static int autofs4_tree_busy(struct vfsmount *mnt,
 
         p = NULL;
         while ((p = get_next_positive_dentry(p, top))) {
-                DPRINTK("dentry %p %.*s",
-                        p, (int) p->d_name.len, p->d_name.name);
+                DPRINTK("dentry %p %pd", p, p);
 
                 /*
                  * Is someone visiting anywhere in the subtree ?
@@ -277,13 +273,11 @@ static struct dentry *autofs4_check_leaves(struct vfsmount *mnt,
 {
         struct dentry *p;
 
-        DPRINTK("parent %p %.*s",
-                parent, (int)parent->d_name.len, parent->d_name.name);
+        DPRINTK("parent %p %pd", parent, parent);
 
         p = NULL;
         while ((p = get_next_positive_dentry(p, parent))) {
-                DPRINTK("dentry %p %.*s",
-                        p, (int) p->d_name.len, p->d_name.name);
+                DPRINTK("dentry %p %pd", p, p);
 
                 if (d_mountpoint(p)) {
                         /* Can we umount this guy */
@@ -368,8 +362,7 @@ static struct dentry *should_expire(struct dentry *dentry,
          *         offset (autofs-5.0+).
          */
         if (d_mountpoint(dentry)) {
-                DPRINTK("checking mountpoint %p %.*s",
-                        dentry, (int)dentry->d_name.len, dentry->d_name.name);
+                DPRINTK("checking mountpoint %p %pd", dentry, dentry);
 
                 /* Can we umount this guy */
                 if (autofs4_mount_busy(mnt, dentry))
@@ -382,8 +375,7 @@ static struct dentry *should_expire(struct dentry *dentry,
         }
 
         if (dentry->d_inode && S_ISLNK(dentry->d_inode->i_mode)) {
-                DPRINTK("checking symlink %p %.*s",
-                        dentry, (int)dentry->d_name.len, dentry->d_name.name);
+                DPRINTK("checking symlink %p %pd", dentry, dentry);
                 /*
                  * A symlink can't be "busy" in the usual sense so
                  * just check last used for expire timeout.
@@ -479,8 +471,7 @@ struct dentry *autofs4_expire_indirect(struct super_block *sb,
         return NULL;
 
 found:
-        DPRINTK("returning %p %.*s",
-                expired, (int)expired->d_name.len, expired->d_name.name);
+        DPRINTK("returning %p %pd", expired, expired);
         ino->flags |= AUTOFS_INF_EXPIRING;
         smp_mb();
         ino->flags &= ~AUTOFS_INF_NO_RCU;
@@ -512,8 +503,7 @@ int autofs4_expire_wait(struct dentry *dentry, int rcu_walk)
         if (ino->flags & AUTOFS_INF_EXPIRING) {
                 spin_unlock(&sbi->fs_lock);
 
-                DPRINTK("waiting for expire %p name=%.*s",
-                         dentry, dentry->d_name.len, dentry->d_name.name);
+                DPRINTK("waiting for expire %p name=%pd", dentry, dentry);
 
                 status = autofs4_wait(sbi, dentry, NFY_NONE);
                 wait_for_completion(&ino->expire_complete);
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 0822c9eacc56..dbb5b7212ce1 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -108,8 +108,7 @@ static int autofs4_dir_open(struct inode *inode, struct file *file)
         struct dentry *dentry = file->f_path.dentry;
         struct autofs_sb_info *sbi = autofs4_sbi(dentry->d_sb);
 
-        DPRINTK("file=%p dentry=%p %.*s",
-                file, dentry, dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("file=%p dentry=%p %pD", file, dentry, dentry);
 
         if (autofs4_oz_mode(sbi))
                 goto out;
@@ -279,8 +278,7 @@ static int autofs4_mount_wait(struct dentry *dentry, bool rcu_walk)
         if (ino->flags & AUTOFS_INF_PENDING) {
                 if (rcu_walk)
                         return -ECHILD;
-                DPRINTK("waiting for mount name=%.*s",
-                        dentry->d_name.len, dentry->d_name.name);
+                DPRINTK("waiting for mount name=%pd", dentry);
                 status = autofs4_wait(sbi, dentry, NFY_MOUNT);
                 DPRINTK("mount wait done status=%d", status);
         }
@@ -340,8 +338,7 @@ static struct vfsmount *autofs4_d_automount(struct path *path)
         struct autofs_info *ino = autofs4_dentry_ino(dentry);
         int status;
 
-        DPRINTK("dentry=%p %.*s",
-                dentry, dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("dentry=%p %pd", dentry, dentry);
 
         /* The daemon never triggers a mount. */
         if (autofs4_oz_mode(sbi))
@@ -428,8 +425,7 @@ static int autofs4_d_manage(struct dentry *dentry, bool rcu_walk)
         struct autofs_info *ino = autofs4_dentry_ino(dentry);
         int status;
 
-        DPRINTK("dentry=%p %.*s",
-                dentry, dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("dentry=%p %pd", dentry, dentry);
 
         /* The daemon never waits. */
         if (autofs4_oz_mode(sbi)) {
@@ -504,7 +500,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, u
         struct autofs_info *ino;
         struct dentry *active;
 
-        DPRINTK("name = %.*s", dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("name = %pd", dentry);
 
         /* File name too long to exist */
         if (dentry->d_name.len > NAME_MAX)
@@ -558,8 +554,7 @@ static int autofs4_dir_symlink(struct inode *dir,
         size_t size = strlen(symname);
         char *cp;
 
-        DPRINTK("%s <- %.*s", symname,
-                dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("%s <- %pd", symname, dentry);
 
         if (!autofs4_oz_mode(sbi))
                 return -EACCES;
@@ -701,8 +696,7 @@ static int autofs4_dir_rmdir(struct inode *dir, struct dentry *dentry)
         struct autofs_info *ino = autofs4_dentry_ino(dentry);
         struct autofs_info *p_ino;
         
-        DPRINTK("dentry %p, removing %.*s",
-                dentry, dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("dentry %p, removing %pd", dentry, dentry);
 
         if (!autofs4_oz_mode(sbi))
                 return -EACCES;
@@ -744,8 +738,7 @@ static int autofs4_dir_mkdir(struct inode *dir, struct dentry *dentry, umode_t m
         if (!autofs4_oz_mode(sbi))
                 return -EACCES;
 
-        DPRINTK("dentry %p, creating %.*s",
-                dentry, dentry->d_name.len, dentry->d_name.name);
+        DPRINTK("dentry %p, creating %pd", dentry, dentry);
 
         BUG_ON(!ino);