Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull misc vfs updates from Al Viro:
 "Assorted misc bits and pieces.

  There are several single-topic branches left after this (rename2
  series from Miklos, current_time series from Deepa Dinamani, xattr
  series from Andreas, uaccess stuff from from me) and I'd prefer to
  send those separately"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits)
  proc: switch auxv to use of __mem_open()
  hpfs: support FIEMAP
  cifs: get rid of unused arguments of CIFSSMBWrite()
  posix_acl: uapi header split
  posix_acl: xattr representation cleanups
  fs/aio.c: eliminate redundant loads in put_aio_ring_file
  fs/internal.h: add const to ns_dentry_operations declaration
  compat: remove compat_printk()
  fs/buffer.c: make __getblk_slow() static
  proc: unsigned file descriptors
  fs/file: more unsigned file descriptors
  fs: compat: remove redundant check of nr_segs
  cachefiles: Fix attempt to read i_blocks after deleting file [ver #2]
  cifs: don't use memcpy() to copy struct iov_iter
  get rid of separate multipage fault-in primitives
  fs: Avoid premature clearing of capabilities
  fs: Give dentry to inode_change_ok() instead of inode
  fuse: Propagate dentry down to inode_change_ok()
  ceph: Propagate dentry down to inode_change_ok()
  xfs: Propagate dentry down to inode_change_ok()
  ...

2 files changed, 8 insertions, 12 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index 2d6f44fbaf62..f4d75ffe3d8a 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -1571,8 +1571,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;
         }
 
@@ -1627,17 +1627,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 539d718df797..07da4efe8458 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1748,9 +1748,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;