nfsd: switch to %p[dD]

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

1 files changed, 13 insertions, 15 deletions

diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
index 814afaa4458a..3d0e15ae6f72 100644
--- a/fs/nfsd/nfsfh.c
+++ b/fs/nfsd/nfsfh.c
@@ -47,7 +47,7 @@ static int nfsd_acceptable(void *expv, struct dentry *dentry)
                 tdentry = parent;
         }
         if (tdentry != exp->ex_path.dentry)
-                dprintk("nfsd_acceptable failed at %p %s\n", tdentry, tdentry->d_name.name);
+                dprintk("nfsd_acceptable failed at %p %pd\n", tdentry, tdentry);
         rv = (tdentry == exp->ex_path.dentry);
         dput(tdentry);
         return rv;
@@ -253,8 +253,8 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp)
 
         if (S_ISDIR(dentry->d_inode->i_mode) &&
                         (dentry->d_flags & DCACHE_DISCONNECTED)) {
-                printk("nfsd: find_fh_dentry returned a DISCONNECTED directory: %s/%s\n",
-                                dentry->d_parent->d_name.name, dentry->d_name.name);
+                printk("nfsd: find_fh_dentry returned a DISCONNECTED directory: %pd2\n",
+                                dentry);
         }
 
         fhp->fh_dentry = dentry;
@@ -361,10 +361,9 @@ skip_pseudoflavor_check:
         error = nfsd_permission(rqstp, exp, dentry, access);
 
         if (error) {
-                dprintk("fh_verify: %s/%s permission failure, "
+                dprintk("fh_verify: %pd2 permission failure, "
                         "acc=%x, error=%d\n",
-                        dentry->d_parent->d_name.name,
-                        dentry->d_name.name,
+                        dentry,
                         access, ntohl(error));
         }
 out:
@@ -514,14 +513,13 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
          */
 
         struct inode * inode = dentry->d_inode;
-        struct dentry *parent = dentry->d_parent;
         __u32 *datap;
         dev_t ex_dev = exp_sb(exp)->s_dev;
 
-        dprintk("nfsd: fh_compose(exp %02x:%02x/%ld %s/%s, ino=%ld)\n",
+        dprintk("nfsd: fh_compose(exp %02x:%02x/%ld %pd2, ino=%ld)\n",
                 MAJOR(ex_dev), MINOR(ex_dev),
                 (long) exp->ex_path.dentry->d_inode->i_ino,
-                parent->d_name.name, dentry->d_name.name,
+                dentry,
                 (inode ? inode->i_ino : 0));
 
         /* Choose filehandle version and fsid type based on
@@ -534,13 +532,13 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry,
                 fh_put(ref_fh);
 
         if (fhp->fh_locked || fhp->fh_dentry) {
-                printk(KERN_ERR "fh_compose: fh %s/%s not initialized!\n",
-                       parent->d_name.name, dentry->d_name.name);
+                printk(KERN_ERR "fh_compose: fh %pd2 not initialized!\n",
+                       dentry);
         }
         if (fhp->fh_maxsize < NFS_FHSIZE)
-                printk(KERN_ERR "fh_compose: called with maxsize %d! %s/%s\n",
+                printk(KERN_ERR "fh_compose: called with maxsize %d! %pd2\n",
                        fhp->fh_maxsize,
-                       parent->d_name.name, dentry->d_name.name);
+                       dentry);
 
         fhp->fh_dentry = dget(dentry); /* our internal copy */
         fhp->fh_export = exp;
@@ -613,8 +611,8 @@ out_bad:
         printk(KERN_ERR "fh_update: fh not verified!\n");
         goto out;
 out_negative:
-        printk(KERN_ERR "fh_update: %s/%s still negative!\n",
-                dentry->d_parent->d_name.name, dentry->d_name.name);
+        printk(KERN_ERR "fh_update: %pd2 still negative!\n",
+                dentry);
         goto out;
 }