qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>,
	Jeff Cody <jcody@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Eric Blake <eblake@redhat.com>, John Snow <jsnow@redhat.com>,
	qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com,
	den@openvz.org
Subject: [Qemu-devel] [PATCH for-2.7 06/15] gluster: Implement .bdrv_lockf
Date: Wed, 13 Apr 2016 17:09:55 +0800	[thread overview]
Message-ID: <1460538604-12132-7-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1460538604-12132-1-git-send-email-famz@redhat.com>

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/gluster.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/block/gluster.c b/block/gluster.c
index 51e154c..e76ec87 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -672,6 +672,36 @@ static void qemu_gluster_close(BlockDriverState *bs)
     glfs_fini(s->glfs);
 }
 
+static int qemu_gluster_lockf(BlockDriverState *bs, BdrvLockfCmd cmd,
+                              Error **errp)
+{
+    BDRVGlusterState *s = bs->opaque;
+    int ret;
+    struct flock fl = (struct flock) {
+        .l_start = 0,
+        .l_whence  = SEEK_SET,
+        .l_len = 0,
+    };
+    switch (cmd) {
+    case BDRV_LOCKF_RWLOCK:
+        fl.l_type = F_WRLCK;
+        break;
+    case BDRV_LOCKF_ROLOCK:
+        fl.l_type = F_RDLCK;
+        break;
+    case BDRV_LOCKF_UNLOCK:
+        fl.l_type = F_UNLCK;
+        break;
+    default:
+        abort();
+    }
+    ret = glfs_posix_lock(s->fd, F_SETLK, &fl);
+    if (ret == -1) {
+        error_setg_errno(errp, errno, "Failed to lock image");
+    }
+    return ret == -1 ? -errno : 0;
+}
+
 static int qemu_gluster_has_zero_init(BlockDriverState *bs)
 {
     /* GlusterFS volume could be backed by a block device */
@@ -713,6 +743,7 @@ static BlockDriver bdrv_gluster = {
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
+    .bdrv_lockf                   = qemu_gluster_lockf,
     .bdrv_has_zero_init           = qemu_gluster_has_zero_init,
 #ifdef CONFIG_GLUSTERFS_DISCARD
     .bdrv_co_discard              = qemu_gluster_co_discard,
@@ -740,6 +771,7 @@ static BlockDriver bdrv_gluster_tcp = {
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
+    .bdrv_lockf                   = qemu_gluster_lockf,
     .bdrv_has_zero_init           = qemu_gluster_has_zero_init,
 #ifdef CONFIG_GLUSTERFS_DISCARD
     .bdrv_co_discard              = qemu_gluster_co_discard,
@@ -767,6 +799,7 @@ static BlockDriver bdrv_gluster_unix = {
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
+    .bdrv_lockf                   = qemu_gluster_lockf,
     .bdrv_has_zero_init           = qemu_gluster_has_zero_init,
 #ifdef CONFIG_GLUSTERFS_DISCARD
     .bdrv_co_discard              = qemu_gluster_co_discard,
@@ -794,6 +827,7 @@ static BlockDriver bdrv_gluster_rdma = {
     .bdrv_co_readv                = qemu_gluster_co_readv,
     .bdrv_co_writev               = qemu_gluster_co_writev,
     .bdrv_co_flush_to_disk        = qemu_gluster_co_flush_to_disk,
+    .bdrv_lockf                   = qemu_gluster_lockf,
     .bdrv_has_zero_init           = qemu_gluster_has_zero_init,
 #ifdef CONFIG_GLUSTERFS_DISCARD
     .bdrv_co_discard              = qemu_gluster_co_discard,
-- 
2.8.0

  parent reply	other threads:[~2016-04-13  9:10 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-13  9:09 [Qemu-devel] [PATCH for-2.7 00/15] block: Lock images when opening Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 01/15] block: Add BDRV_O_NO_LOCK Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 02/15] qapi: Add lock-image in blockdev-add options Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 03/15] blockdev: Add and parse "lock-image" option for block devices Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 04/15] block: Introduce image file locking interface Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 05/15] raw-posix: Implement .bdrv_lockf Fam Zheng
2016-04-13  9:21   ` Daniel P. Berrange
2016-04-14  2:24     ` Fam Zheng
2016-04-13  9:09 ` Fam Zheng [this message]
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 07/15] qemu-io: Add "-L" option for BDRV_O_NO_LOCK Fam Zheng
2016-04-14  7:06   ` Denis V. Lunev
2016-04-14  8:15     ` Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 08/15] qemu-iotests: 140: Disable image lock for qemu-io access Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 09/15] qemu-iotests: 046: Move version detection out from verify_io Fam Zheng
2016-04-13  9:09 ` [Qemu-devel] [PATCH for-2.7 10/15] qemu-iotests: Fix lock-image for shared disk in test case 091 Fam Zheng
2016-04-13  9:10 ` [Qemu-devel] [PATCH for-2.7 11/15] qemu-iotests: Disable image lock when checking test image Fam Zheng
2016-04-13  9:10 ` [Qemu-devel] [PATCH for-2.7 12/15] qemu-iotests: 051: Disable image lock in the command line Fam Zheng
2016-04-13  9:10 ` [Qemu-devel] [PATCH for-2.7 13/15] ahci-test: Specify "lock-image=off" in CLI Fam Zheng
2016-04-13  9:10 ` [Qemu-devel] [PATCH for-2.7 14/15] ide-test: Specify "lock-image=off" in command lines Fam Zheng
2016-04-13  9:10 ` [Qemu-devel] [PATCH for-2.7 15/15] block: Turn on image locking by default Fam Zheng
2016-04-13  9:19 ` [Qemu-devel] [PATCH for-2.7 00/15] block: Lock images when opening Daniel P. Berrange
2016-04-14  2:31   ` Fam Zheng
2016-04-13 10:18 ` Denis V. Lunev
2016-04-14  2:36   ` Fam Zheng
2016-04-14  5:04     ` Denis V. Lunev
2016-04-14  5:46       ` Fam Zheng
2016-04-14  6:14         ` Denis V. Lunev
2016-04-14  6:23           ` Fam Zheng
2016-04-14  6:41             ` Denis V. Lunev
2016-04-17 19:15 ` Richard W.M. Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460538604-12132-7-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=den@openvz.org \
    --cc=eblake@redhat.com \
    --cc=jcody@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).