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

Pull vfs updates from Al Viro:
 "The big thing in this pile is Eric's unmount-on-rmdir series; we
  finally have everything we need for that.  The final piece of prereqs
  is delayed mntput() - now filesystem shutdown always happens on
  shallow stack.

  Other than that, we have several new primitives for iov_iter (Matt
  Wilcox, culled from his XIP-related series) pushing the conversion to
  ->read_iter()/ ->write_iter() a bit more, a bunch of fs/dcache.c
  cleanups and fixes (including the external name refcounting, which
  gives consistent behaviour of d_move() wrt procfs symlinks for long
  and short names alike) and assorted cleanups and fixes all over the
  place.

  This is just the first pile; there's a lot of stuff from various
  people that ought to go in this window.  Starting with
  unionmount/overlayfs mess...  ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (60 commits)
  fs/file_table.c: Update alloc_file() comment
  vfs: Deduplicate code shared by xattr system calls operating on paths
  reiserfs: remove pointless forward declaration of struct nameidata
  don't need that forward declaration of struct nameidata in dcache.h anymore
  take dname_external() into fs/dcache.c
  let path_init() failures treated the same way as subsequent link_path_walk()
  fix misuses of f_count() in ppp and netlink
  ncpfs: use list_for_each_entry() for d_subdirs walk
  vfs: move getname() from callers to do_mount()
  gfs2_atomic_open(): skip lookups on hashed dentry
  [infiniband] remove pointless assignments
  gadgetfs: saner API for gadgetfs_create_file()
  f_fs: saner API for ffs_sb_create_file()
  jfs: don't hash direct inode
  [s390] remove pointless assignment of ->f_op in vmlogrdr ->open()
  ecryptfs: ->f_op is never NULL
  android: ->f_op is never NULL
  nouveau: __iomem misannotations
  missing annotation in fs/file.c
  fs: namespace: suppress 'may be used uninitialized' warnings
  ...

4 files changed, 20 insertions, 24 deletions

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 6cbd9c688cfe..073640675a39 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -461,8 +461,8 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 inode, direntry, direntry);
 
         tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb));
         if (IS_ERR(tlink)) {
@@ -540,8 +540,8 @@ int cifs_create(struct inode *inode, struct dentry *direntry, umode_t mode,
         struct cifs_fid fid;
         __u32 oplock;
 
-        cifs_dbg(FYI, "cifs_create parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "cifs_create parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 inode, direntry, direntry);
 
         tlink = cifs_sb_tlink(CIFS_SB(inode->i_sb));
         rc = PTR_ERR(tlink);
@@ -713,8 +713,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "parent inode = 0x%p name is: %s and dentry = 0x%p\n",
-                 parent_dir_inode, direntry->d_name.name, direntry);
+        cifs_dbg(FYI, "parent inode = 0x%p name is: %pd and dentry = 0x%p\n",
+                 parent_dir_inode, direntry, direntry);
 
         /* check whether path exists */
 
@@ -833,7 +833,7 @@ cifs_d_revalidate(struct dentry *direntry, unsigned int flags)
 {
         int rc = 0;
 
-        cifs_dbg(FYI, "In cifs d_delete, name = %s\n", direntry->d_name.name);
+        cifs_dbg(FYI, "In cifs d_delete, name = %pd\n", direntry);
 
         return rc;
 }     */
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 5f29354b072a..8f7b40fd8f3b 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1650,8 +1650,8 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,
 
         cifs_sb = CIFS_SB(dentry->d_sb);
 
-        cifs_dbg(FYI, "write %zd bytes to offset %lld of %s\n",
-                 write_size, *offset, dentry->d_name.name);
+        cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",
+                 write_size, *offset, dentry);
 
         tcon = tlink_tcon(open_file->tlink);
         server = tcon->ses->server;
@@ -2273,8 +2273,8 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "Sync file - name: %s datasync: 0x%x\n",
-                 file->f_path.dentry->d_name.name, datasync);
+        cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
+                 file, datasync);
 
         if (!CIFS_CACHE_READ(CIFS_I(inode))) {
                 rc = cifs_zap_mapping(inode);
@@ -2315,8 +2315,8 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "Sync file - name: %s datasync: 0x%x\n",
-                 file->f_path.dentry->d_name.name, datasync);
+        cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
+                 file, datasync);
 
         tcon = tlink_tcon(smbfile->tlink);
         if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 7899a40465b3..8fd4ee8e07ff 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1419,8 +1419,8 @@ cifs_posix_mkdir(struct inode *inode, struct dentry *dentry, umode_t mode,
         d_instantiate(dentry, newinode);
 
 #ifdef CONFIG_CIFS_DEBUG2
-        cifs_dbg(FYI, "instantiated dentry %p %s to inode %p\n",
-                 dentry, dentry->d_name.name, newinode);
+        cifs_dbg(FYI, "instantiated dentry %p %pd to inode %p\n",
+                 dentry, dentry, newinode);
 
         if (newinode->i_nlink != 2)
                 cifs_dbg(FYI, "unexpected number of links %d\n",
@@ -2111,8 +2111,8 @@ cifs_setattr_unix(struct dentry *direntry, struct iattr *attrs)
         struct cifs_unix_set_info_args *args = NULL;
         struct cifsFileInfo *open_file;
 
-        cifs_dbg(FYI, "setattr_unix on file %s attrs->ia_valid=0x%x\n",
-                 direntry->d_name.name, attrs->ia_valid);
+        cifs_dbg(FYI, "setattr_unix on file %pd attrs->ia_valid=0x%x\n",
+                 direntry, attrs->ia_valid);
 
         xid = get_xid();
 
@@ -2254,8 +2254,8 @@ cifs_setattr_nounix(struct dentry *direntry, struct iattr *attrs)
 
         xid = get_xid();
 
-        cifs_dbg(FYI, "setattr on file %s attrs->iavalid 0x%x\n",
-                 direntry->d_name.name, attrs->ia_valid);
+        cifs_dbg(FYI, "setattr on file %pd attrs->iavalid 0x%x\n",
+                 direntry, attrs->ia_valid);
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
                 attrs->ia_valid |= ATTR_FORCE;
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index b334a89d6a66..d2141f101382 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -87,8 +87,6 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
                 return;
 
         if (dentry) {
-                int err;
-
                 inode = dentry->d_inode;
                 if (inode) {
                         /*
@@ -105,10 +103,8 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
                                 goto out;
                         }
                 }
-                err = d_invalidate(dentry);
+                d_invalidate(dentry);
                 dput(dentry);
-                if (err)
-                        return;
         }
 
         /*