]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 17:28:45 +0000 (10:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 17:28:45 +0000 (10:28 -0700)
commitf22e4f36943b504fb45eb9b51650423206003193
treecd721c5f49f27527dc7784497903c4be0ac842b7
parent19f8213ab233622f8060dc2a8d2cb9d7a35c9c64
parent6260e83a777eb5fd026281d72f635c5c8eb15b3f
Merge branch 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull parallel lookup fixups from Al Viro:
 "Fix for xfs parallel readdir (turns out the cxfs exposure was not
  enough to catch all problems), and a reversion of btrfs back to
  ->iterate() until the fs/btrfs/delayed-inode.c gets fixed"

* 'work.lookups' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xfs: concurrent readdir hangs on data buffer locks
  Revert "btrfs: switch to ->iterate_shared()"
fs/btrfs/inode.c