tree 2df377b4b08946af496941e9d18a48e9a100af6b
parent 5dfcc87fd79dfb96ed155b524337dbd0da4f5993
parent d525e8ab022cb000e6e31a515ba8c3cf0d9c6130
author Linus Torvalds <torvalds@linux-foundation.org> 1315853269 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1315853269 -0700

Merge branch 'for-linus' of git://github.com/chrismason/linux

* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: add dummy extent if dst offset excceeds file end in
  Btrfs: calc file extent num_bytes correctly in file clone
  btrfs: xattr: fix attribute removal
  Btrfs: fix wrong nbytes information of the inode
  Btrfs: fix the file extent gap when doing direct IO
  Btrfs: fix unclosed transaction handle in btrfs_cont_expand
  Btrfs: fix misuse of trans block rsv
  Btrfs: reset to appropriate block rsv after orphan operations
  Btrfs: skip locking if searching the commit root in csum lookup
  btrfs: fix warning in iput for bad-inode
  Btrfs: fix an oops when deleting snapshots