Commit 8b24cd14 authored Jun 28, 2018 by Kevin Wolf

qcow2: Free allocated clusters on write error



If we managed to allocate the clusters, but then failed to write the
data, there's a good chance that we'll still be able to free the
clusters again in order to avoid cluster leaks (the refcounts are
cached, so even if we can't write them out right now, we may be able to
do so when the VM is resumed after a werror=stop/enospc pause).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>

parent 93a3642e

block/qcow2-cluster.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -994,6 +994,17 @@ err:
		return ret;
		}

		/**
		* Frees the allocated clusters because the request failed and they won't
		* actually be linked.
		*/
		void qcow2_alloc_cluster_abort(BlockDriverState bs, QCowL2Meta m)
		{
		BDRVQcow2State *s = bs->opaque;
		qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits,
		QCOW2_DISCARD_NEVER);
		}

		/*
		* Returns the number of contiguous clusters that can be used for an allocating
		* write, but require COW to be performed (this includes yet unallocated space,

block/qcow2.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1775,6 +1775,8 @@ static coroutine_fn int qcow2_handle_l2meta(BlockDriverState *bs,
		if (ret) {
		goto out;
		}
		} else {
		qcow2_alloc_cluster_abort(bs, l2meta);
		}

		/* Take the request off the list of running requests */

block/qcow2.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -614,6 +614,7 @@ uint64_t qcow2_alloc_compressed_cluster_offset(BlockDriverState *bs,
		int compressed_size);

		int qcow2_alloc_cluster_link_l2(BlockDriverState bs, QCowL2Meta m);
		void qcow2_alloc_cluster_abort(BlockDriverState bs, QCowL2Meta m);
		int qcow2_cluster_discard(BlockDriverState *bs, uint64_t offset,
		uint64_t bytes, enum qcow2_discard_type type,
		bool full_discard);