Commit 9c803c47 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: fix missing snapshot drew unlock when root is dead during swap activation 



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: 60021bd7 ("btrfs: prevent subvol with swapfile from being deleted")
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 951a3f59

fs/btrfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -9876,6 +9876,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",