tree 81282b9875595ece0c3d61a4ea1741aecba0191a
parent 8bd1c8815fc23fa4db2376bf667ef885827b48c9
parent 1cf4ffdb3289624a6462c94f2ce05545b32ef736
author Linus Torvalds <torvalds@linux-foundation.org> 1323379139 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323379139 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: drop spin lock when memory alloc fails
  Btrfs: check if the to-be-added device is writable
  Btrfs: try cluster but don't advance in search list
  Btrfs: try to allocate from cluster even at LOOP_NO_EMPTY_SIZE