Commit 2731f518 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume 



btrfs_record_root_in_trans will return errors in the future, so handle
the error properly in btrfs_delete_subvolume.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b0fec6fd

fs/btrfs/inode.c

+5 −1
Original line number Diff line number Diff line
@@ -4329,7 +4329,11 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) 
		goto out_end_trans;

	}



	btrfs_record_root_in_trans(trans, dest);

	ret = btrfs_record_root_in_trans(trans, dest);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_end_trans;

	}



	memset(&dest->root_item.drop_progress, 0,

		sizeof(dest->root_item.drop_progress));