diff options
| author | Linus Torvalds <[email protected]> | 2014-02-09 19:12:26 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-02-09 19:12:26 +0000 |
| commit | 9c1db7798141e2658e4b5bb170128dfdc3270ff4 (patch) | |
| tree | 1b582ab69b70f0a91f6ec2a5b4d3c0b963822cc1 /fs/jbd2/commit.c | |
| parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Btrfs: fix data corruption when reading/updating compressed extents (diff) | |
| download | kernel-9c1db7798141e2658e4b5bb170128dfdc3270ff4.tar.gz kernel-9c1db7798141e2658e4b5bb170128dfdc3270ff4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This is a small collection of fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix data corruption when reading/updating compressed extents
Btrfs: don't loop forever if we can't run because of the tree mod log
btrfs: reserve no transaction units in btrfs_ioctl_set_features
btrfs: commit transaction after setting label and features
Btrfs: fix assert screwup for the pending move stuff
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions