Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 00:14:05 +0000 (17:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2016 00:14:05 +0000 (17:14 -0700)
commitd102a56edba7a3f236454716fa09920e66772044
treebfed5508d09028bbf180507b21b8ab25c6980eac
parent0121a32201dcc72933fb6019c41661e2f8a02fc5
parent3767e255b390d72f9a33c08d9e86c5f21f25860f
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "Followups to the parallel lookup work:

   - update docs

   - restore killability of the places that used to take ->i_mutex
     killably now that we have down_write_killable() merged

   - Additionally, it turns out that I missed a prerequisite for
     security_d_instantiate() stuff - ->getxattr() wasn't the only thing
     that could be called before dentry is attached to inode; with smack
     we needed the same treatment applied to ->setxattr() as well"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  switch ->setxattr() to passing dentry and inode separately
  switch xattr_handler->set() to passing dentry and inode separately
  restore killability of old mutex_lock_killable(&inode->i_mutex) users
  add down_write_killable_nested()
  update D/f/directory-locking
fs/btrfs/ioctl.c
fs/ceph/xattr.c
fs/nfs/nfs4proc.c
fs/overlayfs/overlayfs.h
fs/overlayfs/readdir.c
fs/xfs/xfs_xattr.c
include/linux/fs.h