[Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache

[Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache

[adamcrume]

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;
+}
+#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)
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache

[Josh Durgin]

[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)
>

Re: [Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

On Thu, Oct 09, 2014 at 11:44:32AM -0700, adamcrume@gmail.com wrote:
> From: Adam Crume <adamcrume@gmail.com>
> 
> This fixes Ceph issue 2467.

A link would be nice:
http://tracker.ceph.com/issues/2467

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

Re: [Qemu-devel] [PATCH] rbd: Add support for bdrv_invalidate_cache

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

On Thu, Oct 09, 2014 at 11:44:32AM -0700, 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(+)

Added URL to commit description and dropped return statement as
requested by Josh.

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]