Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull VFS changes from Al Viro:
 "First pile out of several (there _definitely_ will be more).  Stuff in
  this one:

   - unification of d_splice_alias()/d_materialize_unique()

   - iov_iter rewrite

   - killing a bunch of ->f_path.dentry users (and f_dentry macro).

     Getting that completed will make life much simpler for
     unionmount/overlayfs, since then we'll be able to limit the places
     sensitive to file _dentry_ to reasonably few.  Which allows to have
     file_inode(file) pointing to inode in a covered layer, with dentry
     pointing to (negative) dentry in union one.

     Still not complete, but much closer now.

   - crapectomy in lustre (dead code removal, mostly)

   - "let's make seq_printf return nothing" preparations

   - assorted cleanups and fixes

  There _definitely_ will be more piles"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
  copy_from_iter_nocache()
  new helper: iov_iter_kvec()
  csum_and_copy_..._iter()
  iov_iter.c: handle ITER_KVEC directly
  iov_iter.c: convert copy_to_iter() to iterate_and_advance
  iov_iter.c: convert copy_from_iter() to iterate_and_advance
  iov_iter.c: get rid of bvec_copy_page_{to,from}_iter()
  iov_iter.c: convert iov_iter_zero() to iterate_and_advance
  iov_iter.c: convert iov_iter_get_pages_alloc() to iterate_all_kinds
  iov_iter.c: convert iov_iter_get_pages() to iterate_all_kinds
  iov_iter.c: convert iov_iter_npages() to iterate_all_kinds
  iov_iter.c: iterate_and_advance
  iov_iter.c: macros for iterating over iov_iter
  kill f_dentry macro
  dcache: fix kmemcheck warning in switch_names
  new helper: audit_file()
  nfsd_vfs_write(): use file_inode()
  ncpfs: use file_inode()
  kill f_dentry uses
  lockd: get rid of ->f_path.dentry->d_sb
  ...

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/s390/char/hmcdrv_dev.c b/drivers/s390/char/hmcdrv_dev.c
index 0c5176179c17..43cee7fcd01c 100644
--- a/drivers/s390/char/hmcdrv_dev.c
+++ b/drivers/s390/char/hmcdrv_dev.c
@@ -136,8 +136,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp)
         if (rc)
                 module_put(THIS_MODULE);
 
-        pr_debug("open file '/dev/%s' with return code %d\n",
-                 fp->f_dentry->d_name.name, rc);
+        pr_debug("open file '/dev/%pD' with return code %d\n", fp, rc);
         return rc;
 }
 
@@ -146,7 +145,7 @@ static int hmcdrv_dev_open(struct inode *inode, struct file *fp)
  */
 static int hmcdrv_dev_release(struct inode *inode, struct file *fp)
 {
-        pr_debug("closing file '/dev/%s'\n", fp->f_dentry->d_name.name);
+        pr_debug("closing file '/dev/%pD'\n", fp);
         kfree(fp->private_data);
         fp->private_data = NULL;
         hmcdrv_ftp_shutdown();
@@ -231,8 +230,8 @@ static ssize_t hmcdrv_dev_read(struct file *fp, char __user *ubuf,
         retlen = hmcdrv_dev_transfer((char *) fp->private_data,
                                      *pos, ubuf, len);
 
-        pr_debug("read from file '/dev/%s' at %lld returns %zd/%zu\n",
-                 fp->f_dentry->d_name.name, (long long) *pos, retlen, len);
+        pr_debug("read from file '/dev/%pD' at %lld returns %zd/%zu\n",
+                 fp, (long long) *pos, retlen, len);
 
         if (retlen > 0)
                 *pos += retlen;
@@ -248,8 +247,8 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,
 {
         ssize_t retlen;
 
-        pr_debug("writing file '/dev/%s' at pos. %lld with length %zd\n",
-                 fp->f_dentry->d_name.name, (long long) *pos, len);
+        pr_debug("writing file '/dev/%pD' at pos. %lld with length %zd\n",
+                 fp, (long long) *pos, len);
 
         if (!fp->private_data) { /* first expect a cmd write */
                 fp->private_data = kmalloc(len + 1, GFP_KERNEL);
@@ -272,8 +271,7 @@ static ssize_t hmcdrv_dev_write(struct file *fp, const char __user *ubuf,
         if (retlen > 0)
                 *pos += retlen;
 
-        pr_debug("write to file '/dev/%s' returned %zd\n",
-                 fp->f_dentry->d_name.name, retlen);
+        pr_debug("write to file '/dev/%pD' returned %zd\n", fp, retlen);
 
         return retlen;
 }