From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60846)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <josh.durgin@inktank.com>) id 1XcKtl-0005z2-05
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 17:05:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <josh.durgin@inktank.com>) id 1XcKte-0007Aw-Us
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 17:05:20 -0400
Received: from mail.hq.newdream.net ([66.33.206.127]:38604)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <josh.durgin@inktank.com>) id 1XcKte-0007Aa-QI
	for qemu-devel@nongnu.org; Thu, 09 Oct 2014 17:05:14 -0400
Message-ID: <5436F886.4020702@inktank.com>
Date: Thu, 09 Oct 2014 14:05:10 -0700
From: Josh Durgin <josh.durgin@inktank.com>
MIME-Version: 1.0
References: <1412880272-3154-1-git-send-email-adamcrume@gmail.com>
In-Reply-To: <1412880272-3154-1-git-send-email-adamcrume@gmail.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: adamcrume@gmail.com, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>

[adding block maintainers to cc]

On 10/09/2014 11:44 AM, adamcrume@gmail.com wrote:
> From: Adam Crume <adamcrume@gmail.com>
>
> This fixes Ceph issue 2467.
>
> Signed-off-by: Adam Crume <adamcrume@gmail.com>
> ---
>   block/rbd.c |   16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
>
> diff --git a/block/rbd.c b/block/rbd.c
> index 96947e3..d88ba70 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -887,6 +887,19 @@ static BlockDriverAIOCB* qemu_rbd_aio_discard(BlockDriverState *bs,
>   }
>   #endif
>
> +#ifdef LIBRBD_SUPPORTS_INVALIDATE
> +static void qemu_rbd_invalidate_cache(BlockDriverState *bs,
> +                                      Error **errp)
> +{
> +    BDRVRBDState *s = bs->opaque;
> +    int r = rbd_invalidate_cache(s->image);
> +    if (r < 0) {
> +        error_setg_errno(errp, -r, "Failed to invalidate the cache");
> +    }
> +    return r;

No return needed here. With that fixed:

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

> +}
> +#endif
> +
>   static QemuOptsList qemu_rbd_create_opts = {
>       .name = "rbd-create-opts",
>       .head = QTAILQ_HEAD_INITIALIZER(qemu_rbd_create_opts.head),
> @@ -936,6 +949,9 @@ static BlockDriver bdrv_rbd = {
>       .bdrv_snapshot_delete   = qemu_rbd_snap_remove,
>       .bdrv_snapshot_list     = qemu_rbd_snap_list,
>       .bdrv_snapshot_goto     = qemu_rbd_snap_rollback,
> +#ifdef LIBRBD_SUPPORTS_INVALIDATE
> +    .bdrv_invalidate_cache  = qemu_rbd_invalidate_cache,
> +#endif
>   };
>
>   static void bdrv_rbd_init(void)
>