]> git.hungrycats.org Git - linux/commit
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)
committerDavid Sterba <dsterba@suse.com>
Sun, 8 Nov 2026 06:07:54 +0000 (01:07 -0500)
commit352f79eff849fd8cb1d7112efeacf947cd5a3f32
treed803fed95a17f6786d74d46386b3f387426c9086
parent15b8a56af52503247c0bc5bb44c61b6890b691f9
btrfs: scrub: fix lost wakeup and hang when cancelling a scrub that is finishing

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 bca2507eda60cf43e09b98aae2914d96744881d7)
fs/btrfs/scrub.c