assorted conversions to %p[dD]

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

3 files changed, 9 insertions, 12 deletions

diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c
index 28f1af2db1f5..1c27831df1ac 100644
--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -331,8 +331,7 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
 
         if (mm->exe_file) {
                 app_cookie = fast_get_dcookie(&mm->exe_file->f_path);
-                pr_debug("got dcookie for %s\n",
-                         mm->exe_file->f_dentry->d_name.name);
+                pr_debug("got dcookie for %pD\n", mm->exe_file);
         }
 
         for (vma = mm->mmap; vma; vma = vma->vm_next) {
@@ -342,15 +341,14 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
                 if (!vma->vm_file)
                         goto fail_no_image_cookie;
 
-                pr_debug("Found spu ELF at %X(object-id:%lx) for file %s\n",
-                         my_offset, spu_ref,
-                         vma->vm_file->f_dentry->d_name.name);
+                pr_debug("Found spu ELF at %X(object-id:%lx) for file %pD\n",
+                         my_offset, spu_ref, vma->vm_file);
                 *offsetp = my_offset;
                 break;
         }
 
         *spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path);
-        pr_debug("got dcookie for %s\n", vma->vm_file->f_dentry->d_name.name);
+        pr_debug("got dcookie for %pD\n", vma->vm_file);
 
         up_read(&mm->mmap_sem);
 
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 2badf2bf9cd7..47fe1055c714 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -83,10 +83,9 @@ static ssize_t dbfs_read(struct file *file, char __user *buf,
 
 static long dbfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct hypfs_dbfs_file *df;
+        struct hypfs_dbfs_file *df = file_inode(file)->i_private;
         long rc;
 
-        df = file->f_path.dentry->d_inode->i_private;
         mutex_lock(&df->lock);
         if (df->unlocked_ioctl)
                 rc = df->unlocked_ioctl(file, cmd, arg);
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index df91466f973d..ae6aad1d24f7 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -342,8 +342,8 @@ static int load_aout_binary(struct linux_binprm *bprm)
                             time_after(jiffies, error_time + 5*HZ)) {
                         printk(KERN_WARNING
                                "fd_offset is not page aligned. Please convert "
-                               "program: %s\n",
-                               bprm->file->f_path.dentry->d_name.name);
+                               "program: %pD\n",
+                               bprm->file);
                         error_time = jiffies;
                 }
 #endif
@@ -429,8 +429,8 @@ static int load_aout_library(struct file *file)
                 if (time_after(jiffies, error_time + 5*HZ)) {
                         printk(KERN_WARNING
                                "N_TXTOFF is not page aligned. Please convert "
-                               "library: %s\n",
-                               file->f_path.dentry->d_name.name);
+                               "library: %pD\n",
+                               file);
                         error_time = jiffies;
                 }
 #endif