[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] block/amend: Always call .bdrv_amend_clean()
From: |
Hanna Reitz |
Subject: |
[PATCH 2/5] block/amend: Always call .bdrv_amend_clean() |
Date: |
Fri, 4 Mar 2022 16:37:26 +0100 |
.bdrv_amend_clean() says block drivers can use it to clean up what was
done in .bdrv_amend_pre_run(). Therefore, it should always be called
after .bdrv_amend_pre_run(), which means we need it to call it in the
JobDriver.free() callback, not in JobDriver.clean().
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
block/amend.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/amend.c b/block/amend.c
index f465738665..553890ded9 100644
--- a/block/amend.c
+++ b/block/amend.c
@@ -62,7 +62,7 @@ static int blockdev_amend_pre_run(BlockdevAmendJob *s, Error
**errp)
return 0;
}
-static void blockdev_amend_clean(Job *job)
+static void blockdev_amend_free(Job *job)
{
BlockdevAmendJob *s = container_of(job, BlockdevAmendJob, common);
@@ -75,7 +75,7 @@ static const JobDriver blockdev_amend_job_driver = {
.instance_size = sizeof(BlockdevAmendJob),
.job_type = JOB_TYPE_AMEND,
.run = blockdev_amend_run,
- .clean = blockdev_amend_clean,
+ .free = blockdev_amend_free,
};
void qmp_x_blockdev_amend(const char *job_id,
--
2.34.1
- [PATCH 0/5] block/amend: Fix failures seen in iotest 296, Hanna Reitz, 2022/03/04
- [PATCH 1/5] block/amend: Clean up job on early failure, Hanna Reitz, 2022/03/04
- [PATCH 2/5] block/amend: Always call .bdrv_amend_clean(),
Hanna Reitz <=
- [PATCH 4/5] block/amend: Keep strong reference to BDS, Hanna Reitz, 2022/03/04
- [PATCH 3/5] block/crypto: Reset updating_keys on perm failure, Hanna Reitz, 2022/03/04
- [PATCH 5/5] iotests/296: Accept early failure, Hanna Reitz, 2022/03/04
- Re: [PATCH 0/5] block/amend: Fix failures seen in iotest 296, Kevin Wolf, 2022/03/04