Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

Pull overlayfs updates from Miklos Szeredi:
 "This work from Amir adds NFS export capability to overlayfs. NFS
  exporting an overlay filesystem is a challange because we want to keep
  track of any copy-up of a file or directory between encoding the file
  handle and decoding it.

  This is achieved by indexing copied up objects by lower layer file
  handle. The index is already used for hard links, this patchset
  extends the use to NFS file handle decoding"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs: (51 commits)
  ovl: check ERR_PTR() return value from ovl_encode_fh()
  ovl: fix regression in fsnotify of overlay merge dir
  ovl: wire up NFS export operations
  ovl: lookup indexed ancestor of lower dir
  ovl: lookup connected ancestor of dir in inode cache
  ovl: hash non-indexed dir by upper inode for NFS export
  ovl: decode pure lower dir file handles
  ovl: decode indexed dir file handles
  ovl: decode lower file handles of unlinked but open files
  ovl: decode indexed non-dir file handles
  ovl: decode lower non-dir file handles
  ovl: encode lower file handles
  ovl: copy up before encoding non-connectable dir file handle
  ovl: encode non-indexed upper file handles
  ovl: decode connected upper dir file handles
  ovl: decode pure upper file handles
  ovl: encode pure upper file handles
  ovl: document NFS export
  vfs: factor out helpers d_instantiate_anon() and d_alloc_anon()
  ovl: store 'has_upper' and 'opaque' as bit flags
  ...

diff --cc fs/dcache.c
index cca2b377ff0a488508d89dc5b2aee9641f53c84d,99bce0ed0213c7002b656e74f3b66d5448048ba0..7c38f39958bc371d0324197968a732d68da927d8
--- 1/fs/dcache.c
--- 2/fs/dcache.c
+++ b/fs/dcache.c
@@@ -1961,18 -1954,16 +1953,18 @@@ static struct dentry *__d_instantiate_a
        if (disconnected)
                add_flags |= DCACHE_DISCONNECTED;
  
-       spin_lock(&tmp->d_lock);
-       __d_set_inode_and_type(tmp, inode, add_flags);
-       hlist_add_head(&tmp->d_u.d_alias, &inode->i_dentry);
+       spin_lock(&dentry->d_lock);
+       __d_set_inode_and_type(dentry, inode, add_flags);
+       hlist_add_head(&dentry->d_u.d_alias, &inode->i_dentry);
 -      hlist_bl_lock(&dentry->d_sb->s_anon);
 -      hlist_bl_add_head(&dentry->d_hash, &dentry->d_sb->s_anon);
 -      hlist_bl_unlock(&dentry->d_sb->s_anon);
 +      if (!disconnected) {
-               hlist_bl_lock(&tmp->d_sb->s_roots);
-               hlist_bl_add_head(&tmp->d_hash, &tmp->d_sb->s_roots);
-               hlist_bl_unlock(&tmp->d_sb->s_roots);
++              hlist_bl_lock(&dentry->d_sb->s_roots);
++              hlist_bl_add_head(&dentry->d_hash, &dentry->d_sb->s_roots);
++              hlist_bl_unlock(&dentry->d_sb->s_roots);
 +      }
-       spin_unlock(&tmp->d_lock);
+       spin_unlock(&dentry->d_lock);
        spin_unlock(&inode->i_lock);
  
-       return tmp;
+       return dentry;
  
   out_iput:
        iput(inode);