qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org
Cc: mreitz@redhat.com, pkrempa@redhat.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v4 03/11] rbd: Close image in qemu_rbd_open() error path
Date: Fri, 19 Oct 2018 13:14:35 -0500	[thread overview]
Message-ID: <bf5d464e-fafe-a90d-ebda-d45aa7b8b092@redhat.com> (raw)
In-Reply-To: <20181019163013.11787-4-kwolf@redhat.com>

On 10/19/18 11:30 AM, Kevin Wolf wrote:
> Commit e2b8247a322 introduced an error path in qemu_rbd_open() after
> calling rbd_open(), but neglected to close the image again in this error
> path. The error path should contain everything that the regular close
> function qemu_rbd_close() contains.
> 
> This adds the missing rbd_close() call.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>   block/rbd.c | 1 +
>   1 file changed, 1 insertion(+)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

> diff --git a/block/rbd.c b/block/rbd.c
> index 014c68d629..27c9a1e81c 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -787,6 +787,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
>                            "automatically marking the image read-only.");
>               r = bdrv_set_read_only(bs, true, &local_err);
>               if (r < 0) {
> +                rbd_close(s->image);
>                   error_propagate(errp, local_err);
>                   goto failed_open;
>               }
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

  reply	other threads:[~2018-10-19 18:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-19 16:30 [Qemu-devel] [PATCH v4 00/11] block: Add auto-read-only option Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 01/11] block: Update flags in bdrv_set_read_only() Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 02/11] block: Add auto-read-only option Kevin Wolf
2018-10-31 17:14   ` Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 03/11] rbd: Close image in qemu_rbd_open() error path Kevin Wolf
2018-10-19 18:14   ` Eric Blake [this message]
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 04/11] block: Require auto-read-only for existing fallbacks Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 05/11] nbd: Support auto-read-only option Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 06/11] file-posix: " Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 07/11] curl: " Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 08/11] gluster: " Kevin Wolf
2018-10-19 16:30 ` [Qemu-devel] [PATCH v4 09/11] iscsi: " Kevin Wolf
2018-10-20 19:31 ` [Qemu-devel] [PATCH v4 10/11] block: Make auto-read-only=on default for -drive Kevin Wolf
2018-10-20 19:31 ` [Qemu-devel] [PATCH v4 11/11] qemu-iotests: Test auto-read-only with -drive and -blockdev Kevin Wolf
2018-10-22 12:14   ` Eric Blake
2018-10-31 17:16 ` [Qemu-devel] [PATCH v4 00/11] block: Add auto-read-only option Kevin Wolf

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=bf5d464e-fafe-a90d-ebda-d45aa7b8b092@redhat.com \
    --to=eblake@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pkrempa@redhat.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).