| commit | 50f2d407c09be74c77cf9d502d087398a5ba6055 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 19 17:17:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 19 17:17:32 2011 -0700 |
| tree | 17c1b10bafc7a9769123d61f72d4c5249eee7c9f | |
| parent | c2d7b49f42f50d7fc5cbfd195b785a128723fdf4 [diff] | |
| parent | a66e7cc626f42de6c745963fe0d807518fa49d39 [diff] |
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