From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcJJM-00013R-O8 for qemu-devel@nongnu.org; Thu, 09 Oct 2014 15:23:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XcJJG-0008DC-2S for qemu-devel@nongnu.org; Thu, 09 Oct 2014 15:23:40 -0400 Received: from piha.soe.ucsc.edu ([128.114.52.38]:40173 helo=issdm-45) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XcJJF-0008Cq-Sv for qemu-devel@nongnu.org; Thu, 09 Oct 2014 15:23:33 -0400 From: adamcrume@gmail.com Date: Thu, 9 Oct 2014 11:44:32 -0700 Message-Id: <1412880272-3154-1-git-send-email-adamcrume@gmail.com> Subject: [Qemu-devel] [PATCH] 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: Adam Crume From: Adam Crume This fixes Ceph issue 2467. Signed-off-by: Adam Crume --- 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