| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 13 Oct 2011 06:20:40 +0000 (18:20 +1200) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 13 Oct 2011 06:20:40 +0000 (18:20 +1200) | ||
| commit | b2f9452bd5234d573898bbda52a410b154f8f510 | |
| tree | b2599fdd3247befb52f9b5c64b99aed6f6db195e | tree | snapshot (tar.xz tar.gz zip) |
| parent | 65112dccf8a113737684366349d7f9ec373ddc47 | commit | diff |
| parent | f7f43cc84152e53b5687cd0eb8823310ba065524 | commit | diff |
Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux
* 'btrfs-3.0' of git://github.com/chrismason/linux:
Btrfs: make sure not to defrag extents past i_size
Btrfs: fix recursive auto-defrag
* 'btrfs-3.0' of git://github.com/chrismason/linux:
Btrfs: make sure not to defrag extents past i_size
Btrfs: fix recursive auto-defrag
| fs/btrfs/ioctl.c | diff1 | | diff2 | | blob | history |