Merge branch 'work.const-qstr' into work.misc

13 files changed, 53 insertions, 59 deletions

diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 67001277256c..629eb464d5ba 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -345,7 +345,7 @@ void flush_dcache_page(struct page *page)
                                       != (addr & (SHM_COLOUR - 1))) {
                         __flush_cache_page(mpnt, addr, page_to_phys(page));
                         if (old_addr)
-                                printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)");
+                                printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %pD\n", old_addr, addr, mpnt->vm_file);
                         old_addr = addr;
                 }
         }
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index fa10cef2ba37..1205790ed960 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -104,8 +104,8 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count,
                 ent = debugfs_create_file(files[i].name, S_IFREG | S_IRUGO,
                                           root, tmp, &drm_debugfs_fops);
                 if (!ent) {
-                        DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/%s\n",
-                                  root->d_name.name, files[i].name);
+                        DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/%s\n",
+                                  root, files[i].name);
                         kfree(tmp);
                         ret = -1;
                         goto fail;
diff --git a/drivers/gpu/drm/msm/msm_perf.c b/drivers/gpu/drm/msm/msm_perf.c
index 17fe4e53e0d1..1627294575cb 100644
--- a/drivers/gpu/drm/msm/msm_perf.c
+++ b/drivers/gpu/drm/msm/msm_perf.c
@@ -229,8 +229,8 @@ int msm_perf_debugfs_init(struct drm_minor *minor)
         perf->ent = debugfs_create_file("perf", S_IFREG | S_IRUGO,
                         minor->debugfs_root, perf, &perf_debugfs_fops);
         if (!perf->ent) {
-                DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/perf\n",
-                                minor->debugfs_root->d_name.name);
+                DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/perf\n",
+                                minor->debugfs_root);
                 goto fail;
         }
 
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c
index 3a5fdfcd67ae..8487f461f05f 100644
--- a/drivers/gpu/drm/msm/msm_rd.c
+++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -243,8 +243,8 @@ int msm_rd_debugfs_init(struct drm_minor *minor)
         rd->ent = debugfs_create_file("rd", S_IFREG | S_IRUGO,
                         minor->debugfs_root, rd, &rd_debugfs_fops);
         if (!rd->ent) {
-                DRM_ERROR("Cannot create /sys/kernel/debug/dri/%s/rd\n",
-                                minor->debugfs_root->d_name.name);
+                DRM_ERROR("Cannot create /sys/kernel/debug/dri/%pd/rd\n",
+                                minor->debugfs_root);
                 goto fail;
         }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
index f6591c83d636..affe760c8c22 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
@@ -2422,14 +2422,12 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir)
          */
         if (priv->mac80211_registered) {
                 char buf[100];
-                struct dentry *mac80211_dir, *dev_dir, *root_dir;
+                struct dentry *mac80211_dir, *dev_dir;
 
                 dev_dir = dbgfs_dir->d_parent;
-                root_dir = dev_dir->d_parent;
                 mac80211_dir = priv->hw->wiphy->debugfsdir;
 
-                snprintf(buf, 100, "../../%s/%s", root_dir->d_name.name,
-                         dev_dir->d_name.name);
+                snprintf(buf, 100, "../../%pd2", dev_dir);
 
                 if (!debugfs_create_symlink("iwlwifi", mac80211_dir, buf))
                         goto err;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index b23271755daf..3f91985801e3 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -1547,8 +1547,8 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
         mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
 
         if (!mvmvif->dbgfs_dir) {
-                IWL_ERR(mvm, "Failed to create debugfs directory under %s\n",
-                        dbgfs_dir->d_name.name);
+                IWL_ERR(mvm, "Failed to create debugfs directory under %pd\n",
+                        dbgfs_dir);
                 return;
         }
 
@@ -1602,17 +1602,15 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
          * find
          * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
          */
-        snprintf(buf, 100, "../../../%s/%s/%s/%s",
-                 dbgfs_dir->d_parent->d_parent->d_name.name,
-                 dbgfs_dir->d_parent->d_name.name,
-                 dbgfs_dir->d_name.name,
-                 mvmvif->dbgfs_dir->d_name.name);
+        snprintf(buf, 100, "../../../%pd3/%pd",
+                 dbgfs_dir,
+                 mvmvif->dbgfs_dir);
 
         mvmvif->dbgfs_slink = debugfs_create_symlink(dbgfs_dir->d_name.name,
                                                      mvm->debugfs_dir, buf);
         if (!mvmvif->dbgfs_slink)
-                IWL_ERR(mvm, "Can't create debugfs symbolic link under %s\n",
-                        dbgfs_dir->d_name.name);
+                IWL_ERR(mvm, "Can't create debugfs symbolic link under %pd\n",
+                        dbgfs_dir);
         return;
 err:
         IWL_ERR(mvm, "Can't create debugfs entity\n");
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index b34489817c70..97ab1a885348 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1564,9 +1564,7 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)
          * Create a symlink with mac80211. It will be removed when mac80211
          * exists (before the opmode exists which removes the target.)
          */
-        snprintf(buf, 100, "../../%s/%s",
-                 dbgfs_dir->d_parent->d_parent->d_name.name,
-                 dbgfs_dir->d_parent->d_name.name);
+        snprintf(buf, 100, "../../%pd2", dbgfs_dir->d_parent);
         if (!debugfs_create_symlink("iwlwifi", mvm->hw->wiphy->debugfsdir, buf))
                 goto err;
 
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index 57281b9e31ff..23249b3e6cad 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -1141,8 +1141,8 @@ ll_file_io_generic(const struct lu_env *env, struct vvp_io_args *args,
         struct cl_io     *io;
         ssize_t        result;
 
-        CDEBUG(D_VFSTRACE, "file: %s, type: %d ppos: %llu, count: %zd\n",
-               file->f_path.dentry->d_name.name, iot, *ppos, count);
+        CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zd\n",
+               file, iot, *ppos, count);
 
 restart:
         io = vvp_env_thread_io(env);
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index 324f0af40d7b..284373a57a08 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -177,8 +177,8 @@ static int orangefs_readdir(struct file *file, struct dir_context *ctx)
         }
 
         gossip_debug(GOSSIP_DIR_DEBUG,
-                     "orangefs_readdir called on %s (pos=%llu)\n",
-                     dentry->d_name.name, llu(pos));
+                     "orangefs_readdir called on %pd (pos=%llu)\n",
+                     dentry, llu(pos));
 
         memset(&readdir_response, 0, sizeof(readdir_response));
 
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index 526040e09f78..f3c5b48e0432 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -585,8 +585,8 @@ static int orangefs_file_mmap(struct file *file, struct vm_area_struct *vma)
 static int orangefs_file_release(struct inode *inode, struct file *file)
 {
         gossip_debug(GOSSIP_FILE_DEBUG,
-                     "orangefs_file_release: called on %s\n",
-                     file->f_path.dentry->d_name.name);
+                     "orangefs_file_release: called on %pD\n",
+                     file);
 
         orangefs_flush_inode(inode);
 
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 28a0557a69be..d4c6915f085b 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -129,8 +129,8 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb,
                                   struct iov_iter *iter)
 {
         gossip_debug(GOSSIP_INODE_DEBUG,
-                     "orangefs_direct_IO: %s\n",
-                     iocb->ki_filp->f_path.dentry->d_name.name);
+                     "orangefs_direct_IO: %pD\n",
+                     iocb->ki_filp);
 
         return -EINVAL;
 }
@@ -216,8 +216,8 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
         struct inode *inode = dentry->d_inode;
 
         gossip_debug(GOSSIP_INODE_DEBUG,
-                     "orangefs_setattr: called on %s\n",
-                     dentry->d_name.name);
+                     "orangefs_setattr: called on %pd\n",
+                     dentry);
 
         ret = inode_change_ok(inode, iattr);
         if (ret)
@@ -259,8 +259,8 @@ int orangefs_getattr(struct vfsmount *mnt,
         struct orangefs_inode_s *orangefs_inode = NULL;
 
         gossip_debug(GOSSIP_INODE_DEBUG,
-                     "orangefs_getattr: called on %s\n",
-                     dentry->d_name.name);
+                     "orangefs_getattr: called on %pd\n",
+                     dentry);
 
         ret = orangefs_inode_getattr(inode, 0, 0);
         if (ret == 0) {
diff --git a/fs/orangefs/namei.c b/fs/orangefs/namei.c
index 62c525936ee8..a54390e45553 100644
--- a/fs/orangefs/namei.c
+++ b/fs/orangefs/namei.c
@@ -24,9 +24,9 @@ static int orangefs_create(struct inode *dir,
         struct inode *inode;
         int ret;
 
-        gossip_debug(GOSSIP_NAME_DEBUG, "%s: %s\n",
+        gossip_debug(GOSSIP_NAME_DEBUG, "%s: %pd\n",
                      __func__,
-                     dentry->d_name.name);
+                     dentry);
 
         new_op = op_alloc(ORANGEFS_VFS_OP_CREATE);
         if (!new_op)
@@ -43,9 +43,9 @@ static int orangefs_create(struct inode *dir,
         ret = service_operation(new_op, __func__, get_interruptible_flag(dir));
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "%s: %s: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n",
+                     "%s: %pd: handle:%pU: fsid:%d: new_op:%p: ret:%d:\n",
                      __func__,
-                     dentry->d_name.name,
+                     dentry,
                      &new_op->downcall.resp.create.refn.khandle,
                      new_op->downcall.resp.create.refn.fs_id,
                      new_op,
@@ -57,18 +57,18 @@ static int orangefs_create(struct inode *dir,
         inode = orangefs_new_inode(dir->i_sb, dir, S_IFREG | mode, 0,
                                 &new_op->downcall.resp.create.refn);
         if (IS_ERR(inode)) {
-                gossip_err("%s: Failed to allocate inode for file :%s:\n",
+                gossip_err("%s: Failed to allocate inode for file :%pd:\n",
                            __func__,
-                           dentry->d_name.name);
+                           dentry);
                 ret = PTR_ERR(inode);
                 goto out;
         }
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "%s: Assigned inode :%pU: for file :%s:\n",
+                     "%s: Assigned inode :%pU: for file :%pd:\n",
                      __func__,
                      get_khandle_from_ino(inode),
-                     dentry->d_name.name);
+                     dentry);
 
         d_instantiate(dentry, inode);
         unlock_new_inode(inode);
@@ -76,9 +76,9 @@ static int orangefs_create(struct inode *dir,
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "%s: dentry instantiated for %s\n",
+                     "%s: dentry instantiated for %pd\n",
                      __func__,
-                     dentry->d_name.name);
+                     dentry);
 
         SetMtimeFlag(parent);
         dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
@@ -87,9 +87,9 @@ static int orangefs_create(struct inode *dir,
 out:
         op_release(new_op);
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "%s: %s: returning %d\n",
+                     "%s: %pd: returning %d\n",
                      __func__,
-                     dentry->d_name.name,
+                     dentry,
                      ret);
         return ret;
 }
@@ -115,8 +115,8 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
          * -EEXIST on O_EXCL opens, which is broken if we skip this lookup
          * in the create path)
          */
-        gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %s\n",
-                     __func__, dentry->d_name.name);
+        gossip_debug(GOSSIP_NAME_DEBUG, "%s called on %pd\n",
+                     __func__, dentry);
 
         if (dentry->d_name.len > (ORANGEFS_NAME_MAX - 1))
                 return ERR_PTR(-ENAMETOOLONG);
@@ -169,9 +169,9 @@ static struct dentry *orangefs_lookup(struct inode *dir, struct dentry *dentry,
 
                         gossip_debug(GOSSIP_NAME_DEBUG,
                                      "orangefs_lookup: Adding *negative* dentry "
-                                     "%p for %s\n",
+                                     "%p for %pd\n",
                                      dentry,
-                                     dentry->d_name.name);
+                                     dentry);
 
                         d_add(dentry, NULL);
                         res = NULL;
@@ -224,10 +224,10 @@ static int orangefs_unlink(struct inode *dir, struct dentry *dentry)
         int ret;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "%s: called on %s\n"
+                     "%s: called on %pd\n"
                      "  (inode %pU): Parent is %pU | fs_id %d\n",
                      __func__,
-                     dentry->d_name.name,
+                     dentry,
                      get_khandle_from_ino(inode),
                      &parent->refn.khandle,
                      parent->refn.fs_id);
@@ -326,9 +326,9 @@ static int orangefs_symlink(struct inode *dir,
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "Inode (Symlink) %pU -> %s\n",
+                     "Inode (Symlink) %pU -> %pd\n",
                      get_khandle_from_ino(inode),
-                     dentry->d_name.name);
+                     dentry);
 
         SetMtimeFlag(parent);
         dir->i_mtime = dir->i_ctime = current_fs_time(dir->i_sb);
@@ -390,9 +390,9 @@ static int orangefs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
         ORANGEFS_I(inode)->getattr_time = jiffies - 1;
 
         gossip_debug(GOSSIP_NAME_DEBUG,
-                     "Inode (Directory) %pU -> %s\n",
+                     "Inode (Directory) %pU -> %pd\n",
                      get_khandle_from_ino(inode),
-                     dentry->d_name.name);
+                     dentry);
 
         /*
          * NOTE: we have no good way to keep nlink consistent for directories
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 1714a737d556..4f971551b56f 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -350,8 +350,8 @@ static ssize_t orangefs_debug_write(struct file *file,
         struct client_debug_mask c_mask = { NULL, 0, 0 };
 
         gossip_debug(GOSSIP_DEBUGFS_DEBUG,
-                "orangefs_debug_write: %s\n",
-                file->f_path.dentry->d_name.name);
+                "orangefs_debug_write: %pD\n",
+                file);
 
         /*
          * Thwart users who try to jamb a ridiculous number