From: Filipe Manana Date: Fri, 29 Nov 2024 13:33:03 +0000 (+0000) Subject: btrfs: fix missing snapshot drew unlock when root is dead during swap activation X-Git-Tag: v6.12.5~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=650214c925e8a90b6c03b3d37eff01ad06f83169;p=thirdparty%2Fkernel%2Fstable.git btrfs: fix missing snapshot drew unlock when root is dead during swap activation [ Upstream commit 9c803c474c6c002d8ade68ebe99026cc39c37f85 ] When activating a swap file we acquire the root's snapshot drew lock and then check if the root is dead, failing and returning with -EPERM if it's dead but without unlocking the root's snapshot lock. Fix this by adding the missing unlock. Fixes: 60021bd754c6 ("btrfs: prevent subvol with swapfile from being deleted") Reviewed-by: Johannes Thumshirn Reviewed-by: David Sterba Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index d067db2619713..58ffe78132d9d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9857,6 +9857,7 @@ static int btrfs_swap_activate(struct swap_info_struct *sis, struct file *file, if (btrfs_root_dead(root)) { spin_unlock(&root->root_item_lock); + btrfs_drew_write_unlock(&root->snapshot_lock); btrfs_exclop_finish(fs_info); btrfs_warn(fs_info, "cannot activate swapfile because subvolume %llu is being deleted",