[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] block/io: bdrv_refresh_limits(): use ERRP_GUARD
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 2/4] block/io: bdrv_refresh_limits(): use ERRP_GUARD |
Date: |
Fri, 4 Dec 2020 01:27:11 +0300 |
This simplifies following commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/io.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/io.c b/block/io.c
index ec5e152bb7..3e91074c9f 100644
--- a/block/io.c
+++ b/block/io.c
@@ -135,10 +135,10 @@ static void bdrv_merge_limits(BlockLimits *dst, const
BlockLimits *src)
void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)
{
+ ERRP_GUARD();
BlockDriver *drv = bs->drv;
BdrvChild *c;
bool have_limits;
- Error *local_err = NULL;
memset(&bs->bl, 0, sizeof(bs->bl));
@@ -156,9 +156,8 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp)
QLIST_FOREACH(c, &bs->children, next) {
if (c->role & (BDRV_CHILD_DATA | BDRV_CHILD_FILTERED | BDRV_CHILD_COW))
{
- bdrv_refresh_limits(c->bs, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ bdrv_refresh_limits(c->bs, errp);
+ if (*errp) {
return;
}
bdrv_merge_limits(&bs->bl, &c->bs->bl);
--
2.21.3