diff options
| author | Filipe Manana <fdmanana@suse.com> | 2020-05-08 13:01:47 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-05-25 12:25:29 +0300 |
| commit | 6b7304af62d02d77d740defd4cfddf2ef3188067 (patch) | |
| tree | 506f1d0997d5df2f51919a7286f52dca5759f0e2 /fs/btrfs/scrub.c | |
| parent | 2473d24f2b77da0ffabcbb916793e58e7f57440b (diff) | |
| download | linux-6b7304af62d02d77d740defd4cfddf2ef3188067.tar.xz | |
btrfs: rename member 'trimming' of block group to a more generic name
Back in 2014, commit 04216820fe83d5 ("Btrfs: fix race between fs trimming
and block group remove/allocation"), I added the 'trimming' member to the
block group structure. Its purpose was to prevent races between trimming
and block group deletion/allocation by pinning the block group in a way
that prevents its logical address and device extents from being reused
while trimming is in progress for a block group, so that if another task
deletes the block group and then another task allocates a new block group
that gets the same logical address and device extents while the trimming
task is still in progress.
After the previous fix for scrub (patch "btrfs: fix a race between scrub
and block group removal/allocation"), scrub now also has the same needs that
trimming has, so the member name 'trimming' no longer makes sense.
Since there is already a 'pinned' member in the block group that refers
to space reservations (pinned bytes), rename the member to 'frozen',
add a comment on top of it to describe its general purpose and rename
the helpers to increment and decrement the counter as well, to match
the new member name.
The next patch in the series will move the helpers into a more suitable
file (from free-space-cache.c to block-group.c).
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 7c50ac5b6876..2486f58d8205 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -3583,7 +3583,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, btrfs_put_block_group(cache); goto skip; } - btrfs_get_block_group_trimming(cache); + btrfs_freeze_block_group(cache); spin_unlock(&cache->lock); /* @@ -3641,7 +3641,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, } else { btrfs_warn(fs_info, "failed setting block group ro: %d", ret); - btrfs_put_block_group_trimming(cache); + btrfs_unfreeze_block_group(cache); btrfs_put_block_group(cache); scrub_pause_off(fs_info); break; @@ -3728,7 +3728,7 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, spin_unlock(&cache->lock); } - btrfs_put_block_group_trimming(cache); + btrfs_unfreeze_block_group(cache); btrfs_put_block_group(cache); if (ret) break; |