[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 11/15] qcow2: truncate preallocated space
From: |
Anton Nefedov |
Subject: |
[Qemu-block] [PATCH v5 11/15] qcow2: truncate preallocated space |
Date: |
Wed, 1 Nov 2017 18:44:04 +0300 |
From: "Denis V. Lunev" <address@hidden>
This could be done after calculation of the end of data and metadata in
the qcow2 image.
Signed-off-by: Denis V. Lunev <address@hidden>
Signed-off-by: Anton Nefedov <address@hidden>
---
block/qcow2.h | 3 +++
block/qcow2-cluster.c | 9 +++++++++
block/qcow2-refcount.c | 7 +++++++
block/qcow2.c | 7 +++++++
4 files changed, 26 insertions(+)
diff --git a/block/qcow2.h b/block/qcow2.h
index 9a2711e..579838d 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -330,6 +330,7 @@ typedef struct BDRVQcow2State {
char *image_backing_format;
uint64_t prealloc_size;
+ uint64_t data_end;
} BDRVQcow2State;
typedef struct Qcow2COWRegion {
@@ -693,4 +694,6 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriverState
*bs,
const char *name,
Error **errp);
+void qcow2_update_data_end(BlockDriverState *bs, uint64_t off);
+
#endif
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index e364116..9b24cab 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -2080,3 +2080,12 @@ fail:
g_free(l1_table);
return ret;
}
+
+void qcow2_update_data_end(BlockDriverState *bs, uint64_t off)
+{
+ BDRVQcow2State *s = bs->opaque;
+
+ if (s->data_end < off) {
+ s->data_end = off;
+ }
+}
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index aa3fd6c..5797666 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -834,6 +834,9 @@ static int QEMU_WARN_UNUSED_RESULT
update_refcount(BlockDriverState *bs,
ret = alloc_refcount_block(bs, cluster_index, &refcount_block);
if (ret < 0) {
goto fail;
+ } else {
+ qcow2_update_data_end(bs, s->refcount_table_offset +
+ s->refcount_table_size * sizeof(uint64_t));
}
}
old_table_index = table_index;
@@ -971,6 +974,8 @@ retry:
s->free_cluster_index - 1 > (INT64_MAX >> s->cluster_bits))
{
return -EFBIG;
+ } else {
+ qcow2_update_data_end(bs, s->free_cluster_index << s->cluster_bits);
}
#ifdef DEBUG_ALLOC2
@@ -1035,6 +1040,8 @@ int64_t qcow2_alloc_clusters_at(BlockDriverState *bs,
uint64_t offset,
if (ret < 0) {
return ret;
+ } else {
+ qcow2_update_data_end(bs, offset + (nb_clusters << s->cluster_bits));
}
return i;
diff --git a/block/qcow2.c b/block/qcow2.c
index f41aaac..5e2b543 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1488,6 +1488,8 @@ static int qcow2_do_open(BlockDriverState *bs, QDict
*options, int flags,
}
}
+ s->data_end = bdrv_getlength(bs->file->bs);
+
#ifdef DEBUG_ALLOC
{
BdrvCheckResult result = {0};
@@ -2184,6 +2186,11 @@ static int qcow2_inactivate(BlockDriverState *bs)
if (result == 0) {
qcow2_mark_clean(bs);
+
+ /* truncate preallocated space */
+ if (!bs->read_only && s->data_end < bdrv_getlength(bs->file->bs)) {
+ bdrv_truncate(bs->file, s->data_end, PREALLOC_MODE_OFF, NULL);
+ }
s->flags |= BDRV_O_INACTIVE;
}
--
2.7.4
- [Qemu-block] [PATCH v5 04/15] block: treat BDRV_REQ_ALLOCATE as serialising, (continued)
- [Qemu-block] [PATCH v5 04/15] block: treat BDRV_REQ_ALLOCATE as serialising, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 10/15] qcow2: set inactive flag, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 06/15] block: support BDRV_REQ_ALLOCATE in passthrough drivers, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 05/15] file-posix: support BDRV_REQ_ALLOCATE, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 08/15] qcow2: skip writing zero buffers to empty COW areas, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 03/15] block: introduce BDRV_REQ_ALLOCATE flag, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 14/15] iotest 198: test BDRV_REQ_ALLOCATE, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 13/15] qcow2: do not zero out clusters if already preallocated, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 15/15] iotest 134: test cluster-misaligned encrypted write, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 09/15] qcow2: preallocation at image expand, Anton Nefedov, 2017/11/01
- [Qemu-block] [PATCH v5 11/15] qcow2: truncate preallocated space,
Anton Nefedov <=
- [Qemu-block] [PATCH v5 12/15] qcow2: check space leak at the end of the image, Anton Nefedov, 2017/11/01