All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 07/10] sheepdog: Consistently set bdrv_has_zero_init_truncate
Date: Thu, 26 Mar 2020 15:29:30 +0100	[thread overview]
Message-ID: <20200326142933.625037-8-mreitz@redhat.com> (raw)
In-Reply-To: <20200326142933.625037-1-mreitz@redhat.com>

From: Eric Blake <eblake@redhat.com>

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 <eblake@redhat.com>
Message-Id: <20200324174233.1622067-5-eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 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



  parent reply	other threads:[~2020-03-26 14:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-26 14:29 [PULL 00/10] Block patches for 5.0-rc1 Max Reitz
2020-03-26 14:29 ` [PULL 01/10] block/mirror: fix use after free of local_err Max Reitz
2020-03-26 14:29 ` [PULL 02/10] block: pass BlockDriver reference to the .bdrv_co_create Max Reitz
2020-03-26 14:29 ` [PULL 03/10] block: trickle down the fallback image creation function use to the block drivers Max Reitz
2020-03-26 14:29 ` [PULL 04/10] qcow2: Comment typo fixes Max Reitz
2020-03-26 14:29 ` [PULL 05/10] qcow2: List autoclear bit names in header Max Reitz
2020-03-26 14:29 ` [PULL 06/10] qcow2: Avoid feature name extension on small cluster size Max Reitz
2020-03-26 14:29 ` Max Reitz [this message]
2020-03-26 14:29 ` [PULL 08/10] qemu-img: Fix check's leak/corruption fix report Max Reitz
2020-03-26 14:29 ` [PULL 09/10] iotests: Add poke_file_[bl]e functions Max Reitz
2020-03-26 14:29 ` [PULL 10/10] iotests/138: Test leaks/corruptions fixed report Max Reitz
2020-03-26 16:54 ` [PULL 00/10] Block patches for 5.0-rc1 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200326142933.625037-8-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.