| commit | dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 15 Oct 2009 22:06:37 +0000 (15 15:06 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 15 Oct 2009 22:06:37 +0000 (15 15:06 -0700) | ||
| tree | 30d223a3a3c7470c657284ef030657bd1753d4d3 | treesnapshot (tar.gz zip) |
| parent | 2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 | commitdiff |
| parent | 444528b3e614f7f2391488d9bca8e0b872db909b | commitdiff |
Merge branch 'master' of git://git./linux/kernel/git/mason/btrfs-unstable
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: always pin metadata in discard mode
Btrfs: enable discard support
Btrfs: add -o discard option
Btrfs: properly wait log writers during log sync
Btrfs: fix possible ENOSPC problems with truncate
Btrfs: fix btrfs acl #ifdef checks
Btrfs: streamline tree-log btree block writeout
Btrfs: avoid tree log commit when there are no changes
Btrfs: only write one super copy during fsync
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: always pin metadata in discard mode
Btrfs: enable discard support
Btrfs: add -o discard option
Btrfs: properly wait log writers during log sync
Btrfs: fix possible ENOSPC problems with truncate
Btrfs: fix btrfs acl #ifdef checks
Btrfs: streamline tree-log btree block writeout
Btrfs: avoid tree log commit when there are no changes
Btrfs: only write one super copy during fsync