Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / fs / afs / mntpt.c

diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 9682c33..938c5ab 100644 (file)
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -106,14 +106,7 @@ static struct dentry *afs_mntpt_lookup(struct inode *dir,
                                       struct dentry *dentry,
                                       unsigned int flags)
 {
-       _enter("%p,%p{%p{%s},%s}",
-              dir,
-              dentry,
-              dentry->d_parent,
-              dentry->d_parent ?
-              dentry->d_parent->d_name.name : (const unsigned char *) "",
-              dentry->d_name.name);
-
+       _enter("%p,%p{%pd2}", dir, dentry, dentry);
        return ERR_PTR(-EREMOTE);
 }
 
@@ -122,14 +115,7 @@ static struct dentry *afs_mntpt_lookup(struct inode *dir,
  */
 static int afs_mntpt_open(struct inode *inode, struct file *file)
 {
-       _enter("%p,%p{%p{%s},%s}",
-              inode, file,
-              file->f_path.dentry->d_parent,
-              file->f_path.dentry->d_parent ?
-              file->f_path.dentry->d_parent->d_name.name :
-              (const unsigned char *) "",
-              file->f_path.dentry->d_name.name);
-
+       _enter("%p,%p{%pD2}", inode, file, file);
        return -EREMOTE;
 }
 
@@ -146,7 +132,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
        bool rwpath = false;
        int ret;
 
-       _enter("{%s}", mntpt->d_name.name);
+       _enter("{%pd}", mntpt);
 
        BUG_ON(!mntpt->d_inode);
 
@@ -242,7 +228,7 @@ struct vfsmount *afs_d_automount(struct path *path)
 {
        struct vfsmount *newmnt;
 
-       _enter("{%s}", path->dentry->d_name.name);
+       _enter("{%pd}", path->dentry);
 
        newmnt = afs_mntpt_do_automount(path->dentry);
        if (IS_ERR(newmnt))