file-posix: Fix shared locks on reopen commit
authorMax Reitz <mreitz@redhat.com>
Fri, 16 Nov 2018 16:45:25 +0000 (17:45 +0100)
committerKevin Wolf <kwolf@redhat.com>
Mon, 19 Nov 2018 13:32:01 +0000 (14:32 +0100)
s->locked_shared_perm is the set of bits locked in the file, which is
the inverse of the permissions actually shared.  So we need to pass them
as they are to raw_apply_lock_bytes() instead of inverting them again.

Reported-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/file-posix.c

index 58c86a01eaa3863d7d89b765858faf5a6c141722..07bbdab9539d88221ca0461296591e2366b2fdfa 100644 (file)
@@ -959,7 +959,7 @@ static void raw_reopen_commit(BDRVReopenState *state)
 
     /* Copy locks to the new fd before closing the old one. */
     raw_apply_lock_bytes(NULL, rs->fd, s->locked_perm,
-                         ~s->locked_shared_perm, false, &local_err);
+                         s->locked_shared_perm, false, &local_err);
     if (local_err) {
         /* shouldn't fail in a sane host, but report it just in case. */
         error_report_err(local_err);