Patchwork sheepdog: add missing .bdrv_has_zero_init

login
register
mail settings
Submitter namei.unix@gmail.com
Date Aug. 6, 2013, 6:44 a.m.
Message ID <1375771477-14277-1-git-send-email-namei.unix@gmail.com>
Download mbox | patch
Permalink /patch/264881/
State New
Headers show

Comments

namei.unix@gmail.com - Aug. 6, 2013, 6:44 a.m.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Liu Yuan <namei.unix@gmail.com>
---
 block/sheepdog.c |    2 ++
 1 file changed, 2 insertions(+)
namei.unix@gmail.com - Aug. 6, 2013, 6:53 a.m.
On Tue, Aug 06, 2013 at 02:44:37PM +0800, Liu Yuan wrote:
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> ---
>  block/sheepdog.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/block/sheepdog.c b/block/sheepdog.c
> index 46821df..eeb5617 100644
> --- a/block/sheepdog.c
> +++ b/block/sheepdog.c
> @@ -2421,6 +2421,7 @@ static BlockDriver bdrv_sheepdog = {
>      .bdrv_file_open = sd_open,
>      .bdrv_close     = sd_close,
>      .bdrv_create    = sd_create,
> +    .bdrv_has_zero_init = bdrv_has_zero_init_1,
>      .bdrv_getlength = sd_getlength,
>      .bdrv_truncate  = sd_truncate,
>  
> @@ -2448,6 +2449,7 @@ static BlockDriver bdrv_sheepdog_tcp = {
>      .bdrv_file_open = sd_open,
>      .bdrv_close     = sd_close,
>      .bdrv_create    = sd_create,
> +    .bdrv_has_zero_init = bdrv_has_zero_init_1,
>      .bdrv_getlength = sd_getlength,
>      .bdrv_truncate  = sd_truncate,
>  

This patch should go for v1.6 too, because qemu-img won't create expected sparse
images for sheepdog without this patch.

Thanks
Yuan
MORITA Kazutaka - Aug. 6, 2013, 7:37 a.m.
At Tue,  6 Aug 2013 14:44:37 +0800,
Liu Yuan wrote:
> 
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> ---
>  block/sheepdog.c |    2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Kevin Wolf - Aug. 6, 2013, 8:24 a.m.
Am 06.08.2013 um 09:37 hat MORITA Kazutaka geschrieben:
> At Tue,  6 Aug 2013 14:44:37 +0800,
> Liu Yuan wrote:
> > 
> > Cc: Kevin Wolf <kwolf@redhat.com>
> > Cc: Stefan Hajnoczi <stefanha@redhat.com>
> > Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> > ---
> >  block/sheepdog.c |    2 ++
> >  1 file changed, 2 insertions(+)
> 
> Reviewed-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>

The commit message is lacking. Added this description:

    Commit 3ac21627 changed the behaviour of bdrv_has_zero_init() to default
    to 0. In the review for Sheepdog it turned out that enabling it is safe,
    so that commit updated one BlockDriver definition of sheepdog to use
    bdrv_has_zero_init_1, missed however that there are more BlockDrivers in
    the driver. Fix these now.

And applied the patch to the block branch.

Kevin
namei.unix@gmail.com - Aug. 6, 2013, 8:37 a.m.
On Tue, Aug 06, 2013 at 10:24:42AM +0200, Kevin Wolf wrote:
> Am 06.08.2013 um 09:37 hat MORITA Kazutaka geschrieben:
> > At Tue,  6 Aug 2013 14:44:37 +0800,
> > Liu Yuan wrote:
> > > 
> > > Cc: Kevin Wolf <kwolf@redhat.com>
> > > Cc: Stefan Hajnoczi <stefanha@redhat.com>
> > > Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> > > ---
> > >  block/sheepdog.c |    2 ++
> > >  1 file changed, 2 insertions(+)
> > 
> > Reviewed-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
> 
> The commit message is lacking. Added this description:
> 
>     Commit 3ac21627 changed the behaviour of bdrv_has_zero_init() to default
>     to 0. In the review for Sheepdog it turned out that enabling it is safe,
>     so that commit updated one BlockDriver definition of sheepdog to use
>     bdrv_has_zero_init_1, missed however that there are more BlockDrivers in
>     the driver. Fix these now.
> 
> And applied the patch to the block branch.

Thanks for your detailed commit log, I should have done it.

Yuan

Patch

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 46821df..eeb5617 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2421,6 +2421,7 @@  static BlockDriver bdrv_sheepdog = {
     .bdrv_file_open = sd_open,
     .bdrv_close     = sd_close,
     .bdrv_create    = sd_create,
+    .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_getlength = sd_getlength,
     .bdrv_truncate  = sd_truncate,
 
@@ -2448,6 +2449,7 @@  static BlockDriver bdrv_sheepdog_tcp = {
     .bdrv_file_open = sd_open,
     .bdrv_close     = sd_close,
     .bdrv_create    = sd_create,
+    .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_getlength = sd_getlength,
     .bdrv_truncate  = sd_truncate,