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

Pull vfs fixes from Al Viro:
 "Tmpfs readdir throughput regression fix (this cycle) + some -stable
  fodder all over the place.

  One missing bit is Miklos' tonight locks.c fix - NFS folks had already
  grabbed that one by the time I woke up ;-)"

[ The locks.c fix came through the nfsd tree just moments ago ]

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  namespace: update event counter when umounting a deleted dentry
  9p: use file_dentry()
  ceph: fix d_obtain_alias() misuses
  lockless next_positive()
  libfs.c: new helper - next_positive()
  dcache_{readdir,dir_lseek}(): don't bother with nested ->d_lock

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index 6e72c98162d5..1780218a48f0 100644
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -95,10 +95,8 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, u64 ino)
         }
 
         dentry = d_obtain_alias(inode);
-        if (IS_ERR(dentry)) {
-                iput(inode);
+        if (IS_ERR(dentry))
                 return dentry;
-        }
         err = ceph_init_dentry(dentry);
         if (err < 0) {
                 dput(dentry);
@@ -167,10 +165,8 @@ static struct dentry *__get_parent(struct super_block *sb,
                 return ERR_PTR(-ENOENT);
 
         dentry = d_obtain_alias(inode);
-        if (IS_ERR(dentry)) {
-                iput(inode);
+        if (IS_ERR(dentry))
                 return dentry;
-        }
         err = ceph_init_dentry(dentry);
         if (err < 0) {
                 dput(dentry);
@@ -210,7 +206,7 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb,
 
         dout("fh_to_parent %llx\n", cfh->parent_ino);
         dentry = __get_parent(sb, NULL, cfh->ino);
-        if (IS_ERR(dentry) && PTR_ERR(dentry) == -ENOENT)
+        if (unlikely(dentry == ERR_PTR(-ENOENT)))
                 dentry = __fh_to_dentry(sb, cfh->parent_ino);
         return dentry;
 }