[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 82/85] block/qcow2: Rename "fail_block" to just "fail
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 82/85] block/qcow2: Rename "fail_block" to just "fail" |
Date: |
Tue, 11 Jul 2017 18:08:11 +0200 |
Now alloc_refcount_block() only contains a single fail label, so it
makes more sense to just name it "fail" instead of "fail_block".
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2-refcount.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 082b5de..1aca645 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -381,7 +381,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
ret = qcow2_cache_get_empty(bs, s->refcount_block_cache, new_block,
refcount_block);
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
memset(*refcount_block, 0, s->cluster_size);
@@ -396,12 +396,12 @@ static int alloc_refcount_block(BlockDriverState *bs,
ret = update_refcount(bs, new_block, s->cluster_size, 1, false,
QCOW2_DISCARD_NEVER);
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
ret = qcow2_cache_flush(bs, s->refcount_block_cache);
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
/* Initialize the new refcount block only after updating its refcount,
@@ -409,7 +409,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
ret = qcow2_cache_get_empty(bs, s->refcount_block_cache, new_block,
refcount_block);
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
memset(*refcount_block, 0, s->cluster_size);
@@ -420,7 +420,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
qcow2_cache_entry_mark_dirty(bs, s->refcount_block_cache, *refcount_block);
ret = qcow2_cache_flush(bs, s->refcount_block_cache);
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
/* If the refcount table is big enough, just hook the block up there */
@@ -431,7 +431,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
s->refcount_table_offset + refcount_table_index * sizeof(uint64_t),
&data64, sizeof(data64));
if (ret < 0) {
- goto fail_block;
+ goto fail;
}
s->refcount_table[refcount_table_index] = new_block;
@@ -495,7 +495,7 @@ static int alloc_refcount_block(BlockDriverState *bs,
* allocated metadata. Make the caller search some new space. */
return -EAGAIN;
-fail_block:
+fail:
if (*refcount_block != NULL) {
qcow2_cache_put(bs, s->refcount_block_cache, refcount_block);
}
--
2.9.4
- [Qemu-devel] [PULL 74/85] block/file-posix: Small fixes in raw_create(), (continued)
- [Qemu-devel] [PULL 74/85] block/file-posix: Small fixes in raw_create(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 72/85] block: Add PreallocMode to blk_truncate(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 75/85] block/file-posix: Extract raw_regular_truncate(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 73/85] qemu-img: Expose PreallocMode for resizing, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 78/85] block/qcow2: Generalize preallocate(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 77/85] block/file-posix: Preallocation for truncate, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 76/85] block/file-posix: Generalize raw_regular_truncate, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 79/85] block/qcow2: Lock s->lock in preallocate(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 80/85] block/qcow2: Metadata preallocation for truncate, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 81/85] block/qcow2: Add qcow2_refcount_area(), Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 82/85] block/qcow2: Rename "fail_block" to just "fail",
Max Reitz <=
- [Qemu-devel] [PULL 83/85] block/qcow2: falloc/full preallocating growth, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 84/85] iotests: Add preallocated resize test for raw, Max Reitz, 2017/07/11
- [Qemu-devel] [PULL 85/85] iotests: Add preallocated growth test for qcow2, Max Reitz, 2017/07/11
- Re: [Qemu-devel] [PULL 00/85] Block layer patches, Peter Maydell, 2017/07/13