Commit 3a691c50 authored Jun 13, 2017 by Max Reitz

block: Add PreallocMode to blk_truncate()



blk_truncate() itself will pass that value to bdrv_truncate(), and all
callers of blk_truncate() just set the parameter to PREALLOC_MODE_OFF
for now.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170613202107.10125-4-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>

parent 7ea37c30

block/block-backend.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1773,14 +1773,15 @@ int blk_pwrite_compressed(BlockBackend blk, int64_t offset, const void buf,
		BDRV_REQ_WRITE_COMPRESSED);
		}

		int blk_truncate(BlockBackend blk, int64_t offset, Error *errp)
		int blk_truncate(BlockBackend *blk, int64_t offset, PreallocMode prealloc,
		Error **errp)
		{
		if (!blk_is_available(blk)) {
		error_setg(errp, "No medium inserted");
		return -ENOMEDIUM;
		}

		return bdrv_truncate(blk->root, offset, PREALLOC_MODE_OFF, errp);
		return bdrv_truncate(blk->root, offset, prealloc, errp);
		}

		static void blk_pdiscard_entry(void *opaque)

block/commit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -163,7 +163,7 @@ static void coroutine_fn commit_run(void *opaque)
		}

		if (base_len < s->common.len) {
		ret = blk_truncate(s->base, s->common.len, NULL);
		ret = blk_truncate(s->base, s->common.len, PREALLOC_MODE_OFF, NULL);
		if (ret) {
		goto out;
		}
		@@ -521,7 +521,7 @@ int bdrv_commit(BlockDriverState *bs)
		* grow the backing file image if possible. If not possible,
		* we must return an error */
		if (length > backing_length) {
		ret = blk_truncate(backing, length, &local_err);
		ret = blk_truncate(backing, length, PREALLOC_MODE_OFF, &local_err);
		if (ret < 0) {
		error_report_err(local_err);
		goto ro_cleanup;

block/mirror.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -739,7 +739,8 @@ static void coroutine_fn mirror_run(void *opaque)
		}

		if (s->bdev_length > base_length) {
		ret = blk_truncate(s->target, s->bdev_length, NULL);
		ret = blk_truncate(s->target, s->bdev_length, PREALLOC_MODE_OFF,
		NULL);
		if (ret < 0) {
		goto immediate_exit;
		}

block/parallels.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ static int parallels_create(const char filename, QemuOpts opts, Error **errp)

		blk_set_allow_write_beyond_eof(file, true);

		ret = blk_truncate(file, 0, errp);
		ret = blk_truncate(file, 0, PREALLOC_MODE_OFF, errp);
		if (ret < 0) {
		goto exit;
		}

block/qcow.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -813,7 +813,7 @@ static int qcow_create(const char filename, QemuOpts opts, Error **errp)

		blk_set_allow_write_beyond_eof(qcow_blk, true);

		ret = blk_truncate(qcow_blk, 0, errp);
		ret = blk_truncate(qcow_blk, 0, PREALLOC_MODE_OFF, errp);
		if (ret < 0) {
		goto exit;
		}