From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGAh-0004HT-Hh for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:51:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlGAc-0000An-Ni for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:51:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGAc-0000AM-5b for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:51:38 -0500 From: Stefan Hajnoczi Date: Mon, 3 Nov 2014 11:50:17 +0000 Message-Id: <1415015456-25086-15-git-send-email-stefanha@redhat.com> In-Reply-To: <1415015456-25086-1-git-send-email-stefanha@redhat.com> References: <1415015456-25086-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 14/53] rbd: Add support for bdrv_invalidate_cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Adam Crume From: Adam Crume This fixes Ceph issue 2467: ttp://tracker.ceph.com/issues/2467 [Dropped return r in void function as suggested by Josh Durgin . --Stefan] Signed-off-by: Adam Crume Reviewed-by: Josh Durgin Reviewed-by: Stefan Hajnoczi Message-id: 1412880272-3154-1-git-send-email-adamcrume@gmail.com Signed-off-by: Stefan Hajnoczi --- block/rbd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/rbd.c b/block/rbd.c index 47cab8b..5b5a64a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -887,6 +887,18 @@ static BlockAIOCB* 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"); + } +} +#endif + static QemuOptsList qemu_rbd_create_opts = { .name = "rbd-create-opts", .head = QTAILQ_HEAD_INITIALIZER(qemu_rbd_create_opts.head), @@ -936,6 +948,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.9.3