From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aquQr-0004RJ-Of for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aquQq-00034t-Pd for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:28:33 -0400 From: Fam Zheng Date: Fri, 15 Apr 2016 11:27:57 +0800 Message-Id: <1460690887-32751-8-git-send-email-famz@redhat.com> In-Reply-To: <1460690887-32751-1-git-send-email-famz@redhat.com> References: <1460690887-32751-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 v2 07/17] rbd: Implement image locking List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com, den@openvz.org librbd has the locking API that can be used to implement .bdrv_lockf. Signed-off-by: Fam Zheng --- block/rbd.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/block/rbd.c b/block/rbd.c index 5bc5b32..a495083 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -810,6 +810,30 @@ static int qemu_rbd_truncate(BlockDriverState *bs, int64_t offset) return 0; } +static int qemu_rbd_lockf(BlockDriverState *bs, BdrvLockfCmd cmd) +{ + int ret; + BDRVRBDState *s = bs->opaque; + + /* XXX: RBD locks are not released automatically when program exits, which + * means if QEMU dies it cannot open the image next time until manually + * unlocked. */ + switch (cmd) { + case BDRV_LOCKF_RWLOCK: + ret = rbd_lock_exclusive(s->image, NULL); + break; + case BDRV_LOCKF_ROLOCK: + ret = rbd_lock_shared(s->image, NULL, NULL); + break; + case BDRV_LOCKF_UNLOCK: + ret = rbd_unlock(s->image, NULL); + break; + default: + abort(); + } + return ret; +} + static int qemu_rbd_snap_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) { @@ -998,6 +1022,7 @@ static BlockDriver bdrv_rbd = { .bdrv_aio_discard = qemu_rbd_aio_discard, #endif + .bdrv_lockf = qemu_rbd_lockf, .bdrv_snapshot_create = qemu_rbd_snap_create, .bdrv_snapshot_delete = qemu_rbd_snap_remove, .bdrv_snapshot_list = qemu_rbd_snap_list, -- 2.8.0