1 files changed, 9 insertions, 16 deletions

diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index d76d083f2f06..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;
@@ -687,7 +682,7 @@ static void autofs_clear_leaf_automount_flags(struct dentry *dentry)
         /* only consider parents below dentrys in the root */
         if (IS_ROOT(parent->d_parent))
                 return;
-        d_child = &dentry->d_u.d_child;
+        d_child = &dentry->d_child;
         /* Set parent managed if it's becoming empty */
         if (d_child->next == &parent->d_subdirs &&
             d_child->prev == &parent->d_subdirs)
@@ -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);