From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Sep 2011 18:47:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/chrismason/linux
X-Git-Tag: v3.1-rc6~4
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=0b001b2edaead6fd906b1f87967ae05f082189c4;p=sfrench%2Fcifs-2.6.git

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
---

0b001b2edaead6fd906b1f87967ae05f082189c4