From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL v2 11/12] file-posix: Fix creation locking
Date: Thu, 5 Jul 2018 12:26:03 +0200 [thread overview]
Message-ID: <20180705102604.4986-12-kwolf@redhat.com> (raw)
In-Reply-To: <20180705102604.4986-1-kwolf@redhat.com>
From: Max Reitz <mreitz@redhat.com>
raw_apply_lock_bytes() takes a bit mask of "permissions that are NOT
shared".
Also, make the "perm" and "shared" variables uint64_t, because I do not
particularly like using ~ on signed integers (and other permission masks
are usually uint64_t, too).
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 829ee538d8..b57c58e80f 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2112,7 +2112,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
{
BlockdevCreateOptionsFile *file_opts;
int fd;
- int perm, shared;
+ uint64_t perm, shared;
int result = 0;
/* Validate options and set default values */
@@ -2148,7 +2148,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
/* Step one: Take locks */
- result = raw_apply_lock_bytes(fd, perm, shared, false, errp);
+ result = raw_apply_lock_bytes(fd, perm, ~shared, false, errp);
if (result < 0) {
goto out_close;
}
--
2.13.6
next prev parent reply other threads:[~2018-07-05 10:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 10:25 [Qemu-devel] [PULL v2 00/12] Block layer patches Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 01/12] qemu-img: allow compressed not-in-order writes Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 02/12] qcow2: refactor data compression Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 03/12] qcow2: add compress threads Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 04/12] block: Move two block permission constants to the relevant enum Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 05/12] block: Add blklogwrites Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 06/12] block: Don't silently truncate node names Kevin Wolf
2018-07-05 10:25 ` [Qemu-devel] [PULL v2 07/12] block/crypto: Fix memory leak in create error path Kevin Wolf
2018-07-05 10:26 ` [Qemu-devel] [PULL v2 08/12] block/blklogwrites: Change log_sector_size from int64_t to uint64_t Kevin Wolf
2018-07-05 10:26 ` [Qemu-devel] [PULL v2 09/12] block/blklogwrites: Add an option for appending to an old log Kevin Wolf
2018-07-05 16:06 ` Eric Blake
2018-07-06 12:26 ` Ari Sundholm
2018-07-05 10:26 ` [Qemu-devel] [PULL v2 10/12] block/blklogwrites: Add an option for the update interval of the log superblock Kevin Wolf
2018-07-05 10:26 ` Kevin Wolf [this message]
2018-07-05 10:26 ` [Qemu-devel] [PULL v2 12/12] file-posix: Unlock FD after creation Kevin Wolf
2018-07-05 15:50 ` [Qemu-devel] [PULL v2 00/12] Block layer patches Peter Maydell
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=20180705102604.4986-12-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.