Merge branch 'for-linus' of git://github.com/chrismason/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 00:17:32 +0000 (17:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 Sep 2011 00:17:32 +0000 (17:17 -0700)
commit50f2d407c09be74c77cf9d502d087398a5ba6055
tree17c1b10bafc7a9769123d61f72d4c5249eee7c9f
parentc2d7b49f42f50d7fc5cbfd195b785a128723fdf4
parenta66e7cc626f42de6c745963fe0d807518fa49d39
Merge branch 'for-linus' of git://github.com/chrismason/linux

* 'for-linus' of git://github.com/chrismason/linux:
  Btrfs: only clear the need lookup flag after the dentry is setup
  BTRFS: Fix lseek return value for error
  Btrfs: don't change inode flag of the dest clone file
  Btrfs: don't make a file partly checksummed through file clone
  Btrfs: fix pages truncation in btrfs_ioctl_clone()
  btrfs: fix d_off in the first dirent