diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2021-12-03 17:18:13 -0500 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-01-07 14:18:24 +0100 |
| commit | 655807b8957ba84a583104c422a8f53725997d55 (patch) | |
| tree | eeb16ff3a661b2229ecae0c39e044b563e2329cf /fs | |
| parent | btrfs: control extent reference updates with a control flag for truncate (diff) | |
| download | linux-dev-655807b8957ba84a583104c422a8f53725997d55.tar.xz linux-dev-655807b8957ba84a583104c422a8f53725997d55.zip | |
btrfs: use a flag to control when to clear the file extent range
We only care about updating the file extent range when we are doing a
normal truncation. We skip this for tree logging currently, but we can
also skip this for eviction as well. Using a flag makes it more
explicit when we want to do this work.
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/free-space-cache.c | 1 | ||||
| -rw-r--r-- | fs/btrfs/inode-item.c | 8 | ||||
| -rw-r--r-- | fs/btrfs/inode-item.h | 6 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 1 |
4 files changed, 12 insertions, 4 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index d2f4716f8485..3a6bf361409b 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -294,6 +294,7 @@ int btrfs_truncate_free_space_cache(struct btrfs_trans_handle *trans, struct btrfs_truncate_control control = { .new_size = 0, .min_type = BTRFS_EXTENT_DATA_KEY, + .clear_extent_range = true, }; struct btrfs_inode *inode = BTRFS_I(vfs_inode); struct btrfs_root *root = inode->root; diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c index 4c753415ab06..5598090bd0aa 100644 --- a/fs/btrfs/inode-item.c +++ b/fs/btrfs/inode-item.c @@ -624,11 +624,11 @@ search_again: } delete: /* - * We use btrfs_truncate_inode_items() to clean up log trees for - * multiple fsyncs, and in this case we don't want to clear the - * file extent range because it's just the log. + * We only want to clear the file extent range if we're + * modifying the actual inode's mapping, which is just the + * normal truncate path. */ - if (root == inode->root) { + if (control->clear_extent_range) { ret = btrfs_inode_clear_file_extent_range(inode, clear_start, clear_len); if (ret) { diff --git a/fs/btrfs/inode-item.h b/fs/btrfs/inode-item.h index 1f31bb407f4a..5817ba4ddd23 100644 --- a/fs/btrfs/inode-item.h +++ b/fs/btrfs/inode-item.h @@ -43,6 +43,12 @@ struct btrfs_truncate_control { * extents we drop. */ bool skip_ref_updates; + + /* + * IN: true if we need to clear the file extent range for the inode as + * we drop the file extent items. + */ + bool clear_extent_range; }; int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 38f974b16fc0..1a3f40be4ed8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8534,6 +8534,7 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback) { struct btrfs_truncate_control control = { .min_type = BTRFS_EXTENT_DATA_KEY, + .clear_extent_range = true, }; struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); struct btrfs_root *root = BTRFS_I(inode)->root; |