tree dc60c1623f63a7db588de4c3c7362a9ac7abf56a
parent ce7e5d2d19bc371e1b67826bfbc79bbcbaa9772f
parent b9fab919b748c7b39c19ff236ed6c5682c266dde
author Linus Torvalds <torvalds@linux-foundation.org> 1336324807 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1336324807 -0700

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

Pull btrfs fixes from Chris Mason:
 "The big ones here are a memory leak we introduced in rc1, and a
  scheduling while atomic if the transid on disk doesn't match the
  transid we expected.  This happens for corrupt blocks, or out of date
  disks.

  It also fixes up the ioctl definition for our ioctl to resolve logical
  inode numbers.  The __u32 was a merging error and doesn't match what
  we ship in the progs."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: avoid sleeping in verify_parent_transid while atomic
  Btrfs: fix crash in scrub repair code when device is missing
  btrfs: Fix mismatching struct members in ioctl.h
  Btrfs: fix page leak when allocing extent buffers
  Btrfs: Add properly locking around add_root_to_dirty_list