1 files changed, 4 insertions, 2 deletions

diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
index 3e418a3aeb11..6b9e29d050f3 100644
--- a/fs/btrfs/zstd.c
+++ b/fs/btrfs/zstd.c
@@ -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);
 }
 
 /*