[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 26/59] block/replication.c: remove unneeded label in replicati
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 26/59] block/replication.c: remove unneeded label in replication_co_writev |
Date: |
Mon, 6 Jan 2020 15:23:52 -0300 |
The label 'out' in replication_co_writev() can be replaced by
'return ret'. The other label, 'out1', was renamed to 'out'
since the original 'out' label was removed.
CC: Wen Congyang <address@hidden>
CC: Xie Changlong <address@hidden>
Signed-off-by: Daniel Henrique Barboza <address@hidden>
---
block/replication.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/block/replication.c b/block/replication.c
index 99532ce521..3d5eb64d41 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -258,7 +258,7 @@ static coroutine_fn int
replication_co_writev(BlockDriverState *bs,
assert(!flags);
ret = replication_get_io_status(s);
if (ret < 0) {
- goto out;
+ return ret;
}
if (ret == 0) {
@@ -280,7 +280,7 @@ static coroutine_fn int
replication_co_writev(BlockDriverState *bs,
remaining_sectors * BDRV_SECTOR_SIZE,
&count);
if (ret < 0) {
- goto out1;
+ goto out;
}
assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE));
@@ -292,7 +292,7 @@ static coroutine_fn int
replication_co_writev(BlockDriverState *bs,
ret = bdrv_co_pwritev(target, sector_num * BDRV_SECTOR_SIZE,
n * BDRV_SECTOR_SIZE, &hd_qiov, 0);
if (ret < 0) {
- goto out1;
+ goto out;
}
remaining_sectors -= n;
@@ -300,9 +300,8 @@ static coroutine_fn int
replication_co_writev(BlockDriverState *bs,
bytes_done += count;
}
-out1:
- qemu_iovec_destroy(&hd_qiov);
out:
+ qemu_iovec_destroy(&hd_qiov);
return ret;
}
--
2.24.1
- Re: [PATCH v1 17/59] block/dmg.c: remove unneeded 'fail' label in dmg_read_mish_block(), (continued)
- [PATCH v1 19/59] block/ssh.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 20/59] block/vpc.c: remove unneeded 'fail' label in create_dynamic_disk(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 18/59] qcow2-refcount.c: remove unneeded 'fail' label in qcow2_refcount_init(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 21/59] block/backup.c remove unneeded 'out' label in backup_run(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 22/59] block/vmdk.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 23/59] block/vxhs.c: remove unneeded 'out' label in vxhs_iio_callback(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 24/59] block/vhdx-log.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 25/59] block/vhdx.c: remove unneeded 'exit' labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 26/59] block/replication.c: remove unneeded label in replication_co_writev,
Daniel Henrique Barboza <=
- [PATCH v1 27/59] crypto/block-luks.c: remove unneeded label in qcrypto_block_luks_find_key, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 28/59] qga/commands-win32.c: remove 'out' label in get_pci_info, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 29/59] cryptodev-vhost.c: remove unneeded 'err' label in cryptodev_vhost_start, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 30/59] util/module.c: remove unneeded label in module_load_file(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 31/59] util/aio-posix.c: remove unneeded 'out' label in aio_epoll, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 32/59] qemu-img.c: remove 'out4' label in img_compare, Daniel Henrique Barboza, 2020/01/06