| commit | e34df3344d7b6f284e958147d7225faa340a1f39 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 10:28:45 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 10:28:45 2016 -0700 |
| tree | cd721c5f49f27527dc7784497903c4be0ac842b7 | |
| parent | 442c9ac989d71599ebc39f4ea4d5b0e64996904b [diff] | |
| parent | 9f5418010940236b2c39ea53b99055ca26ff1279 [diff] |
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()"