btrfs: Handle error from btrfs_uuid_tree_rem call in _btrfs_ioctl_set_received_subvol (d87ff758) · Commits · 戴 / test

As with every function which deals with modifying the btree btrfs_uuid_tree_rem can fail for any number of reasons (ie. EIO/ENOMEM). Handle return error value from this function gracefully by aborting the transaction. Fixes: ("Btrfs: maintain subvolume items in the UUID tree") Signed-off-by:

Nikolay Borisov <nborisov@suse.com> Reviewed-by:

David Sterba <dsterba@suse.com> Signed-off-by:

David Sterba <dsterba@suse.com>

fs/btrfs/ioctl.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -5048,10 +5048,17 @@ static long _btrfs_ioctl_set_received_subvol(struct file *file,
		received_uuid_changed = memcmp(root_item->received_uuid, sa->uuid,
		BTRFS_UUID_SIZE);
		if (received_uuid_changed &&
		!btrfs_is_empty_uuid(root_item->received_uuid))
		btrfs_uuid_tree_rem(trans, fs_info, root_item->received_uuid,
		!btrfs_is_empty_uuid(root_item->received_uuid)) {
		ret = btrfs_uuid_tree_rem(trans, fs_info,
		root_item->received_uuid,
		BTRFS_UUID_KEY_RECEIVED_SUBVOL,
		root->root_key.objectid);
		if (ret && ret != -ENOENT) {
		btrfs_abort_transaction(trans, ret);
		btrfs_end_transaction(trans);
		goto out;
		}
		}
		memcpy(root_item->received_uuid, sa->uuid, BTRFS_UUID_SIZE);
		btrfs_set_root_stransid(root_item, sa->stransid);
		btrfs_set_root_rtransid(root_item, sa->rtransid);

Admin message