Commit d3865159 authored Feb 22, 2019 by Dennis Zhou Committed by David Sterba Feb 27, 2019

btrfs: zstd: ensure reclaim timer is properly cleaned up



The timer function, zstd_reclaim_timer_fn(), reschedules itself under
certain conditions. When cleaning up, take the lock and remove all
workspaces. This prevents the timer from rearming itself. Lastly, switch
to del_timer_sync() to ensure that the timer function can't trigger as
we're unloading.

Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 7503b83d

fs/btrfs/zstd.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -195,8 +195,7 @@ static void zstd_cleanup_workspace_manager(void)
		struct workspace *workspace;
		int i;

		del_timer(&wsm.timer);

		spin_lock(&wsm.lock);
		for (i = 0; i < ZSTD_BTRFS_MAX_LEVEL; i++) {
		while (!list_empty(&wsm.idle_ws[i])) {
		workspace = container_of(wsm.idle_ws[i].next,
		@@ -206,6 +205,9 @@ static void zstd_cleanup_workspace_manager(void)
		wsm.ops->free_workspace(&workspace->list);
		}
		}
		spin_unlock(&wsm.lock);

		del_timer_sync(&wsm.timer);
		}

		/*

Admin message