[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/10] sheepdog: Consistently set bdrv_has_zero_init_truncate
From: |
Max Reitz |
Subject: |
[PULL 07/10] sheepdog: Consistently set bdrv_has_zero_init_truncate |
Date: |
Thu, 26 Mar 2020 15:29:30 +0100 |
From: Eric Blake <address@hidden>
block_int.h claims that .bdrv_has_zero_init must return 0 if
.bdrv_has_zero_init_truncate does likewise; but this is violated if
only the former callback is provided if .bdrv_co_truncate also exists.
When adding the latter callback, it was mistakenly added to only one
of the three possible sheepdog instantiations.
Fixes: 1dcaf527
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/sheepdog.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index a8a7e32a41..59f7ebb171 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -3271,6 +3271,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
.bdrv_co_create = sd_co_create,
.bdrv_co_create_opts = sd_co_create_opts,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
+ .bdrv_has_zero_init_truncate = bdrv_has_zero_init_1,
.bdrv_getlength = sd_getlength,
.bdrv_get_allocated_file_size = sd_get_allocated_file_size,
.bdrv_co_truncate = sd_co_truncate,
@@ -3309,6 +3310,7 @@ static BlockDriver bdrv_sheepdog_unix = {
.bdrv_co_create = sd_co_create,
.bdrv_co_create_opts = sd_co_create_opts,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
+ .bdrv_has_zero_init_truncate = bdrv_has_zero_init_1,
.bdrv_getlength = sd_getlength,
.bdrv_get_allocated_file_size = sd_get_allocated_file_size,
.bdrv_co_truncate = sd_co_truncate,
--
2.25.1
- [PULL 00/10] Block patches for 5.0-rc1, Max Reitz, 2020/03/26
- [PULL 01/10] block/mirror: fix use after free of local_err, Max Reitz, 2020/03/26
- [PULL 02/10] block: pass BlockDriver reference to the .bdrv_co_create, Max Reitz, 2020/03/26
- [PULL 03/10] block: trickle down the fallback image creation function use to the block drivers, Max Reitz, 2020/03/26
- [PULL 04/10] qcow2: Comment typo fixes, Max Reitz, 2020/03/26
- [PULL 05/10] qcow2: List autoclear bit names in header, Max Reitz, 2020/03/26
- [PULL 07/10] sheepdog: Consistently set bdrv_has_zero_init_truncate,
Max Reitz <=
- [PULL 06/10] qcow2: Avoid feature name extension on small cluster size, Max Reitz, 2020/03/26
- [PULL 08/10] qemu-img: Fix check's leak/corruption fix report, Max Reitz, 2020/03/26
- [PULL 09/10] iotests: Add poke_file_[bl]e functions, Max Reitz, 2020/03/26
- [PULL 10/10] iotests/138: Test leaks/corruptions fixed report, Max Reitz, 2020/03/26
- Re: [PULL 00/10] Block patches for 5.0-rc1, Peter Maydell, 2020/03/26