[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] block/commit: keep reference on commit_top_bs
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 1/3] block/commit: keep reference on commit_top_bs |
Date: |
Thu, 11 Mar 2021 18:15:03 +0300 |
Nothing prevent removing of this node during the job. Job needs this
node to be present, so it must keep the reference.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/commit.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index dd9ba87349..57f054ad5d 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -71,9 +71,8 @@ static void commit_abort(Job *job)
bdrv_unfreeze_backing_chain(s->commit_top_bs, s->base_bs);
}
- /* Make sure commit_top_bs and top stay around until bdrv_replace_node() */
+ /* Make sure top stay around until bdrv_replace_node() */
bdrv_ref(top_bs);
- bdrv_ref(s->commit_top_bs);
if (s->base) {
blk_unref(s->base);
@@ -93,7 +92,6 @@ static void commit_abort(Job *job)
bdrv_replace_node(s->commit_top_bs, s->commit_top_bs->backing->bs,
&error_abort);
- bdrv_unref(s->commit_top_bs);
bdrv_unref(top_bs);
}
@@ -109,6 +107,7 @@ static void commit_clean(Job *job)
}
g_free(s->backing_file_str);
+ bdrv_unref(s->commit_top_bs);
blk_unref(s->top);
}
@@ -317,6 +316,8 @@ void commit_start(const char *job_id, BlockDriverState *bs,
goto fail;
}
+ bdrv_ref(commit_top_bs);
+
s->commit_top_bs = commit_top_bs;
/*
@@ -416,6 +417,7 @@ fail:
* otherwise this would fail because of lack of permissions. */
if (commit_top_bs) {
bdrv_replace_node(commit_top_bs, top, &error_abort);
+ bdrv_unref(commit_top_bs);
}
}
--
2.29.2