diff options
| author | Chris Mason <clm@fb.com> | 2016-12-13 18:14:42 +0100 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-12-13 18:14:42 +0100 |
| commit | 5f52a2c512a55500349aa261e469d099ede0f256 (patch) | |
| tree | fc1d55c8f31f12e6eb0536de01a90bf7dfbb329a /fs/btrfs/file.c | |
| parent | Revert "Btrfs: adjust len of writes if following a preallocated extent" (diff) | |
| parent | Btrfs: fix tree search logic when replaying directory entry deletes (diff) | |
| download | linux-5f52a2c512a55500349aa261e469d099ede0f256.tar.xz linux-5f52a2c512a55500349aa261e469d099ede0f256.zip | |
Merge branch 'for-chris-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.10
Patches queued up by Filipe:
The most important change is still the fix for the extent tree
corruption that happens due to balance when qgroups are enabled (a
regression introduced in 4.7 by a fix for a regression from the last
qgroups rework). This has been hitting SLE and openSUSE users and QA
very badly, where transactions keep getting aborted when running
delayed references leaving the root filesystem in RO mode and nearly
unusable. There are fixes here that allow us to run xfstests again
with the integrity checker enabled, which has been impossible since 4.8
(apparently I'm the only one running xfstests with the integrity
checker enabled, which is useful to validate dirtied leafs, like
checking if there are keys out of order, etc). The rest are just some
trivial fixes, most of them tagged for stable, and two cleanups.
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 140271b1ea2e..448f57d108d1 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2372,7 +2372,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) u64 tail_len; u64 orig_start = offset; u64 cur_offset; - u64 min_size = btrfs_calc_trunc_metadata_size(fs_info, 1); + u64 min_size = btrfs_calc_trans_metadata_size(fs_info, 1); u64 drop_end; int ret = 0; int err = 0; @@ -2519,7 +2519,7 @@ static int btrfs_punch_hole(struct inode *inode, loff_t offset, loff_t len) ret = -ENOMEM; goto out_free; } - rsv->size = btrfs_calc_trunc_metadata_size(fs_info, 1); + rsv->size = btrfs_calc_trans_metadata_size(fs_info, 1); rsv->failfast = 1; /* |