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()
  ...

13 files changed, 47 insertions, 57 deletions

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index cb8f0347b934..ff843160c600 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -387,7 +387,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
         if (!access_ok(VERIFY_READ, ptr, args->size))
                 return -EFAULT;
 
-        ret = fault_in_multipages_readable(ptr, args->size);
+        ret = fault_in_pages_readable(ptr, args->size);
         if (ret)
                 return ret;
 
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/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index a77ce9983f69..ccf56c60e6e8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -675,7 +675,7 @@ i915_gem_gtt_pread(struct drm_device *dev,
 
         mutex_unlock(&dev->struct_mutex);
         if (likely(!i915.prefault_disable)) {
-                ret = fault_in_multipages_writeable(user_data, remain);
+                ret = fault_in_pages_writeable(user_data, remain);
                 if (ret) {
                         mutex_lock(&dev->struct_mutex);
                         goto out_unpin;
@@ -803,7 +803,7 @@ i915_gem_shmem_pread(struct drm_device *dev,
                 mutex_unlock(&dev->struct_mutex);
 
                 if (likely(!i915.prefault_disable) && !prefaulted) {
-                        ret = fault_in_multipages_writeable(user_data, remain);
+                        ret = fault_in_pages_writeable(user_data, remain);
                         /* Userspace is tricking us, but we've already clobbered
                          * its pages with the prefault and promised to write the
                          * data up to the first fault. Hence ignore any errors
@@ -1267,7 +1267,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                 return -EFAULT;
 
         if (likely(!i915.prefault_disable)) {
-                ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),
+                ret = fault_in_pages_readable(u64_to_user_ptr(args->data_ptr),
                                                    args->size);
                 if (ret)
                         return -EFAULT;
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index b35e5b6475b2..72628edda376 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1048,7 +1048,7 @@ validate_exec_list(struct drm_device *dev,
                         return -EFAULT;
 
                 if (likely(!i915.prefault_disable)) {
-                        if (fault_in_multipages_readable(ptr, length))
+                        if (fault_in_pages_readable(ptr, length))
                                 return -EFAULT;
                 }
         }
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 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;
 
diff --git a/drivers/staging/lustre/lustre/include/lustre_acl.h b/drivers/staging/lustre/lustre/include/lustre_acl.h
index fecabe139b1f..9786f6caaade 100644
--- a/drivers/staging/lustre/lustre/include/lustre_acl.h
+++ b/drivers/staging/lustre/lustre/include/lustre_acl.h
@@ -38,8 +38,8 @@
 #include <linux/posix_acl_xattr.h>
 
 #define LUSTRE_POSIX_ACL_MAX_ENTRIES    32
-#define LUSTRE_POSIX_ACL_MAX_SIZE                                       \
-        (sizeof(posix_acl_xattr_header) +                               \
-         LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(posix_acl_xattr_entry))
+#define LUSTRE_POSIX_ACL_MAX_SIZE                                               \
+        (sizeof(struct posix_acl_xattr_header) +                                \
+         LUSTRE_POSIX_ACL_MAX_ENTRIES * sizeof(struct posix_acl_xattr_entry))
 
 #endif
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index d56863ff5866..65c945d8bae2 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -1121,8 +1121,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: %zu\n",
-               file->f_path.dentry->d_name.name, iot, *ppos, count);
+        CDEBUG(D_VFSTRACE, "file: %pD, type: %d ppos: %llu, count: %zu\n",
+               file, iot, *ppos, count);
 
 restart:
         io = vvp_env_thread_io(env);
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 6bb41b09172e..e5c62f4ce3d8 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1459,7 +1459,7 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
                 attr->ia_valid |= ATTR_MTIME | ATTR_CTIME;
         }
 
-        /* POSIX: check before ATTR_*TIME_SET set (from inode_change_ok) */
+        /* POSIX: check before ATTR_*TIME_SET set (from setattr_prepare) */
         if (attr->ia_valid & TIMES_SET_FLAGS) {
                 if ((!uid_eq(current_fsuid(), inode->i_uid)) &&
                     !capable(CFS_CAP_FOWNER))
diff --git a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
index e5945e2ccc49..b05b1f935e4c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/wiretest.c
@@ -3742,32 +3742,28 @@ void lustre_assert_wire_constants(void)
         CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
 
         /* Checks for type posix_acl_xattr_entry */
-        LASSERTF((int)sizeof(posix_acl_xattr_entry) == 8, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_entry));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_tag));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_tag));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_perm));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_perm));
-        LASSERTF((int)offsetof(posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_entry, e_id));
-        LASSERTF((int)sizeof(((posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_entry *)0)->e_id));
+        LASSERTF((int)sizeof(struct posix_acl_xattr_entry) == 8, "found %lld\n",
+                 (long long)(int)sizeof(struct posix_acl_xattr_entry));
+        LASSERTF((int)offsetof(struct posix_acl_xattr_entry, e_tag) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct posix_acl_xattr_entry, e_tag));
+        LASSERTF((int)sizeof(((struct posix_acl_xattr_entry *)0)->e_tag) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct posix_acl_xattr_entry *)0)->e_tag));
+        LASSERTF((int)offsetof(struct posix_acl_xattr_entry, e_perm) == 2, "found %lld\n",
+                 (long long)(int)offsetof(struct posix_acl_xattr_entry, e_perm));
+        LASSERTF((int)sizeof(((struct posix_acl_xattr_entry *)0)->e_perm) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct posix_acl_xattr_entry *)0)->e_perm));
+        LASSERTF((int)offsetof(struct posix_acl_xattr_entry, e_id) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct posix_acl_xattr_entry, e_id));
+        LASSERTF((int)sizeof(((struct posix_acl_xattr_entry *)0)->e_id) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct posix_acl_xattr_entry *)0)->e_id));
 
         /* Checks for type posix_acl_xattr_header */
-        LASSERTF((int)sizeof(posix_acl_xattr_header) == 4, "found %lld\n",
-                 (long long)(int)sizeof(posix_acl_xattr_header));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_version) == 0, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_version));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
-        LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
-                 (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
-        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
-                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
+        LASSERTF((int)sizeof(struct posix_acl_xattr_header) == 4, "found %lld\n",
+                 (long long)(int)sizeof(struct posix_acl_xattr_header));
+        LASSERTF((int)offsetof(struct posix_acl_xattr_header, a_version) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct posix_acl_xattr_header, a_version));
+        LASSERTF((int)sizeof(((struct posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct posix_acl_xattr_header *)0)->a_version));
 
         /* Checks for struct link_ea_header */
         LASSERTF((int)sizeof(struct link_ea_header) == 24, "found %lld\n",