| Message ID | 20250318155659.160150-1-maharmstone@fb.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | btrfs: remove call to btrfs_delete_unused_bgs() in close_ctree() | expand |
在 2025/3/19 02:26, Mark Harmstone 写道: > btrfs_delete_unused_bgs() returns early if the filesystem is closing, so the > call in close_ctree() will always do nothing. > > Signed-off-by: Mark Harmstone <maharmstone@fb.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/disk-io.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 1a916716cefe..7c114d5d0f77 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -4412,12 +4412,6 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info) > btrfs_discard_cleanup(fs_info); > > if (!sb_rdonly(fs_info->sb)) { > - /* > - * The cleaner kthread is stopped, so do one final pass over > - * unused block groups. > - */ > - btrfs_delete_unused_bgs(fs_info); > - > /* > * There might be existing delayed inode workers still running > * and holding an empty delayed inode item. We must wait for
On 18.03.25 16:57, Mark Harmstone wrote: > btrfs_delete_unused_bgs() returns early if the filesystem is closing, so the > call in close_ctree() will always do nothing. > > Signed-off-by: Mark Harmstone <maharmstone@fb.com> Looks good, Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On Tue, Mar 18, 2025 at 03:56:56PM +0000, Mark Harmstone wrote: > btrfs_delete_unused_bgs() returns early if the filesystem is closing, so the > call in close_ctree() will always do nothing. > > Signed-off-by: Mark Harmstone <maharmstone@fb.com> > --- > fs/btrfs/disk-io.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 1a916716cefe..7c114d5d0f77 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -4412,12 +4412,6 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info) > btrfs_discard_cleanup(fs_info); > > if (!sb_rdonly(fs_info->sb)) { > - /* > - * The cleaner kthread is stopped, so do one final pass over > - * unused block groups. > - */ > - btrfs_delete_unused_bgs(fs_info); I've checked the original commit that added it, e44163e17796 ("btrfs: explictly delete unused block groups in close_ctree and ro-remount") and this at that time it was cleaning the unused block groups. This changed in 2f12741f81af ("btrfs: use btrfs_fs_closing for background bg work") supposedly moving the work to a workque, so this should be reviewed again if it works as expected.
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 1a916716cefe..7c114d5d0f77 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4412,12 +4412,6 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info) btrfs_discard_cleanup(fs_info); if (!sb_rdonly(fs_info->sb)) { - /* - * The cleaner kthread is stopped, so do one final pass over - * unused block groups. - */ - btrfs_delete_unused_bgs(fs_info); - /* * There might be existing delayed inode workers still running * and holding an empty delayed inode item. We must wait for
btrfs_delete_unused_bgs() returns early if the filesystem is closing, so the call in close_ctree() will always do nothing. Signed-off-by: Mark Harmstone <maharmstone@fb.com> --- fs/btrfs/disk-io.c | 6 ------ 1 file changed, 6 deletions(-)