]> git.hungrycats.org Git - linux/commitdiff
btrfs: scrub: fix lost wakeup and hang when cancelling a scrub that is finishing
authorFilipe Manana <fdmanana@suse.com>
Fri, 16 Oct 2026 16:14:49 +0000 (17:14 +0100)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Thu, 5 Nov 2026 04:21:56 +0000 (23:21 -0500)
When scrub finishes, it does a wakeup on the fs_info->scrub_pause_wait
wait queue and then sets dev->scrub_sctx to NULL. On the other hand the
scrub cancel code (btrfs_scrub_cancel_dev()) waits on that wait queue
for dev->scrub_sctx to be NULL. So this means if btrfs_scrub_cancel_dev()
is called right when scrub is finishing and sees the wakeup before the
NULL is assigned to dev->scrub_sctx by btrfs_scrub_dev(), it hangs.

Fix this by doing the wakeup in btrfs_scrub_dev() after setting
dev->scrub_sctx to NULL.

Fixes: a2de733c78fa ("btrfs: scrub")
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from btrfs for-next commit f64d1d4ceeb7ea9879eeaa4b92ccaa60a24d7cdf)

fs/btrfs/scrub.c

index fdf37653907c7867311ab4bbe585b521cd65726c..a924eeb7a6618bf0b06257da150e69599709665f 100644 (file)
@@ -3174,7 +3174,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
        memalloc_nofs_restore(nofs_flag);
 
        atomic_dec(&fs_info->scrubs_running);
-       wake_up(&fs_info->scrub_pause_wait);
 
        if (progress)
                memcpy(progress, &sctx->stat, sizeof(*progress));
@@ -3187,6 +3186,13 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
        dev->scrub_ctx = NULL;
        mutex_unlock(&fs_info->scrub_lock);
 
+       /*
+        * We have set dev->scrub_ctx to NULL, now do the wakeup as a concurrent
+        * scrub cancel (btrfs_scrub_cancel_dev()) waits for dev->scrub_ctx to
+        * be set to NULL.
+        */
+       wake_up(&fs_info->scrub_pause_wait);
+
        scrub_workers_put(fs_info);
        scrub_put_ctx(sctx);