diff options
| author | Max Reitz <mreitz@redhat.com> | 2018-07-04 16:47:50 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-07-05 11:07:58 +0200 |
| commit | d815efcaf01b1698e2fdf0f3e125201025c53191 (patch) | |
| tree | fd5f634e564a4a41dd60c1dd59da77508b7f7ff1 | |
| parent | 1dce698ea85bb18f62e4c540d4db628bacfba6ba (diff) | |
| download | focaccia-qemu-d815efcaf01b1698e2fdf0f3e125201025c53191.tar.gz focaccia-qemu-d815efcaf01b1698e2fdf0f3e125201025c53191.zip | |
file-posix: Fix creation locking
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>
| -rw-r--r-- | block/file-posix.c | 4 |
1 files 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; } |