diff options
| author | Max Reitz <mreitz@redhat.com> | 2017-05-04 01:11:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-05-11 12:08:24 +0200 |
| commit | 293073a56c6c921c9902da17711914a0042f29ba (patch) | |
| tree | fff27922e591cee8a4a5b509c95baa48e5bccc30 | |
| parent | 564a6b693828ac38f3f562eed9e8b1dc62f45253 (diff) | |
qcow2: Discard preallocated zero clusters
In discard_single_l2(), we completely discard normal clusters instead of
simply turning them into preallocated zero clusters. That means we
should probably do the same with such preallocated zero clusters:
Discard them instead of keeping them allocated.
Reported-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/qcow2-cluster.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index fb91fd8979..31077d8102 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1511,7 +1511,8 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset, break; case QCOW2_CLUSTER_ZERO: - if (!full_discard) { + /* Preallocated zero clusters should be discarded in any case */ + if (!full_discard && (old_l2_entry & L2E_OFFSET_MASK) == 0) { continue; } break; |