From patchwork Thu Sep 15 21:11:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 114834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DDCEFB70BD for ; Fri, 16 Sep 2011 07:11:19 +1000 (EST) Received: from localhost ([::1]:35124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4JDH-00089a-HN for incoming@patchwork.ozlabs.org; Thu, 15 Sep 2011 17:11:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4JD7-00086K-Ei for qemu-devel@nongnu.org; Thu, 15 Sep 2011 17:11:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4JD5-0006f5-R4 for qemu-devel@nongnu.org; Thu, 15 Sep 2011 17:11:05 -0400 Received: from cobra.newdream.net ([66.33.216.30]:46098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4JD5-0006eH-Au for qemu-devel@nongnu.org; Thu, 15 Sep 2011 17:11:03 -0400 Received: from flak.ops.newdream.net (aon.hq.newdream.net [64.111.111.107]) by cobra.newdream.net (Postfix) with ESMTPA id D7703BC95A; Thu, 15 Sep 2011 14:16:56 -0700 (PDT) From: Sage Weil To: qemu-devel@nongnu.org, ceph-devel@vger.kernel.org Date: Thu, 15 Sep 2011 14:11:11 -0700 Message-Id: <1316121071-7690-5-git-send-email-sage@newdream.net> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1316121071-7690-1-git-send-email-sage@newdream.net> References: <1316121071-7690-1-git-send-email-sage@newdream.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 66.33.216.30 Cc: Sage Weil Subject: [Qemu-devel] [PATCH 4/4] rbd: call flush, if available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org librbd recently added async writeback and flush support. If the new rbd_flush() call is available, call it. Signed-off-by: Sage Weil --- block/rbd.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 202e7ec..af65924 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -705,6 +705,17 @@ static BlockDriverAIOCB *qemu_rbd_aio_writev(BlockDriverState *bs, return rbd_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 1); } +static int qemu_rbd_flush(BlockDriverState *bs) +{ +#if LIBRBD_VERSION_CODE >= LIBRBD_VERSION(0, 1, 1) + /* rbd_flush added in 0.1.1 */ + BDRVRBDState *s = bs->opaque; + return rbd_flush(s->image); +#else + return 0; +#endif +} + static int qemu_rbd_getinfo(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVRBDState *s = bs->opaque; @@ -840,6 +851,7 @@ static BlockDriver bdrv_rbd = { .bdrv_file_open = qemu_rbd_open, .bdrv_close = qemu_rbd_close, .bdrv_create = qemu_rbd_create, + .bdrv_flush = qemu_rbd_flush, .bdrv_get_info = qemu_rbd_getinfo, .create_options = qemu_rbd_create_options, .bdrv_getlength = qemu_rbd_getlength,