tree e562b58fda0ecba092c19f83548a12698d4ea5be
parent b971712afc8dd0de38e943ea9d904fe8c8aff956
parent 02dbfc99b424dde3cf0a492ed3bec4f222441754
author Linus Torvalds <torvalds@linux-foundation.org> 1466870018 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1466870018 -0700

Merge branch 'for-linus-4.7-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes part 2 from Chris Mason:
 "This has one patch from Omar to bring iterate_shared back to btrfs.

  We have a tree of work we queue up for directory items and it doesn't
  lend itself well to shared access.  While we're cleaning it up, Omar
  has changed things to use an exclusive lock when there are delayed
  items"

* 'for-linus-4.7-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix ->iterate_shared() by upgrading i_rwsem for delayed nodes