diff mbox

[v13,19/20] file-posix: Add image locking in perm operations

Message ID 20170420094212.GI24486@lemon.lan
State New
Headers show

Commit Message

Fam Zheng April 20, 2017, 9:42 a.m. UTC 
On Thu, 04/20 15:52, Fam Zheng wrote:
> virtlockd in libvirt locks the first byte, so we start looking at the
> file bytes from 0x10.
> 
> The complication is in the transactional interface.  To make the reopen
> logic managable, and allow better reuse, the code is internally
> organized with a table from old mode to the new one.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/file-posix.c | 744 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 741 insertions(+), 3 deletions(-)

Need to squash this in to fix the patchew make check error on centos 6:
diff mbox

Patch

diff --git a/block/file-posix.c b/block/file-posix.c
index b85ac9c..f1563ae 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1069,7 +1069,7 @@  static int raw_handle_lock_update(BlockDriverState *bs,
     int lock_fd;
 
     if (!RAW_LOCK_SUPPORTED) {
-        return 0;
+        goto cleanup;
     }
 
     if (bdrv_get_flags(bs) & BDRV_O_INACTIVE) {