mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/file-posix: Pass FD to locking helpers

Browse Source 
raw_apply_lock_bytes() and raw_check_lock_bytes() currently take a
BDRVRawState *, but they only use the lock_fd field.  During image
creation, we do not have a BDRVRawState, but we do have an FD; so if we
want to reuse the functions there, we should modify them to receive only
the FD.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20180509215336.31304-2-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2018-05-09 23:53:34 +02:00
parent 9f55925b8f
commit d0a96155de
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
block/file-posix.c
View File

@ -643,7 +643,7 @@ typedef enum {
* file; if @unlock == true, also unlock the unneeded bytes. * file; if @unlock == true, also unlock the unneeded bytes.
* @shared_perm_lock_bits is the mask of all permissions that are NOT shared. * @shared_perm_lock_bits is the mask of all permissions that are NOT shared.
*/ */
static int raw_apply_lock_bytes(BDRVRawState *s, static int raw_apply_lock_bytes(int fd,
uint64_t perm_lock_bits, uint64_t perm_lock_bits,
uint64_t shared_perm_lock_bits, uint64_t shared_perm_lock_bits,
bool unlock, Error **errp) bool unlock, Error **errp)
@ -654,13 +654,13 @@ static int raw_apply_lock_bytes(BDRVRawState *s,
PERM_FOREACH(i) { PERM_FOREACH(i) {
int off = RAW_LOCK_PERM_BASE + i; int off = RAW_LOCK_PERM_BASE + i;
if (perm_lock_bits & (1ULL << i)) { if (perm_lock_bits & (1ULL << i)) {
ret = qemu_lock_fd(s->lock_fd, off, 1, false); ret = qemu_lock_fd(fd, off, 1, false);
if (ret) { if (ret) {
error_setg(errp, "Failed to lock byte %d", off); error_setg(errp, "Failed to lock byte %d", off);
return ret; return ret;
} }
} else if (unlock) { } else if (unlock) {
ret = qemu_unlock_fd(s->lock_fd, off, 1); ret = qemu_unlock_fd(fd, off, 1);
if (ret) { if (ret) {
error_setg(errp, "Failed to unlock byte %d", off); error_setg(errp, "Failed to unlock byte %d", off);
return ret; return ret;
@ -670,13 +670,13 @@ static int raw_apply_lock_bytes(BDRVRawState *s,
PERM_FOREACH(i) { PERM_FOREACH(i) {
int off = RAW_LOCK_SHARED_BASE + i; int off = RAW_LOCK_SHARED_BASE + i;
if (shared_perm_lock_bits & (1ULL << i)) { if (shared_perm_lock_bits & (1ULL << i)) {
ret = qemu_lock_fd(s->lock_fd, off, 1, false); ret = qemu_lock_fd(fd, off, 1, false);
if (ret) { if (ret) {
error_setg(errp, "Failed to lock byte %d", off); error_setg(errp, "Failed to lock byte %d", off);
return ret; return ret;
} }
} else if (unlock) { } else if (unlock) {
ret = qemu_unlock_fd(s->lock_fd, off, 1); ret = qemu_unlock_fd(fd, off, 1);
if (ret) { if (ret) {
error_setg(errp, "Failed to unlock byte %d", off); error_setg(errp, "Failed to unlock byte %d", off);
return ret; return ret;
@ -687,8 +687,7 @@ static int raw_apply_lock_bytes(BDRVRawState *s,
} }
/* Check "unshared" bytes implied by @perm and ~@shared_perm in the file. */ /* Check "unshared" bytes implied by @perm and ~@shared_perm in the file. */
static int raw_check_lock_bytes(BDRVRawState *s, static int raw_check_lock_bytes(int fd, uint64_t perm, uint64_t shared_perm,
uint64_t perm, uint64_t shared_perm,
Error **errp) Error **errp)
{ {
int ret; int ret;
@ -698,7 +697,7 @@ static int raw_check_lock_bytes(BDRVRawState *s,
int off = RAW_LOCK_SHARED_BASE + i; int off = RAW_LOCK_SHARED_BASE + i;
uint64_t p = 1ULL << i; uint64_t p = 1ULL << i;
if (perm & p) { if (perm & p) {
ret = qemu_lock_fd_test(s->lock_fd, off, 1, true); ret = qemu_lock_fd_test(fd, off, 1, true);
if (ret) { if (ret) {
char *perm_name = bdrv_perm_names(p); char *perm_name = bdrv_perm_names(p);
error_setg(errp, error_setg(errp,
@ -715,7 +714,7 @@ static int raw_check_lock_bytes(BDRVRawState *s,
int off = RAW_LOCK_PERM_BASE + i; int off = RAW_LOCK_PERM_BASE + i;
uint64_t p = 1ULL << i; uint64_t p = 1ULL << i;
if (!(shared_perm & p)) { if (!(shared_perm & p)) {
ret = qemu_lock_fd_test(s->lock_fd, off, 1, true); ret = qemu_lock_fd_test(fd, off, 1, true);
if (ret) { if (ret) {
char *perm_name = bdrv_perm_names(p); char *perm_name = bdrv_perm_names(p);
error_setg(errp, error_setg(errp,
@ -752,11 +751,11 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
switch (op) { switch (op) {
case RAW_PL_PREPARE: case RAW_PL_PREPARE:
ret = raw_apply_lock_bytes(s, s->perm | new_perm, ret = raw_apply_lock_bytes(s->lock_fd, s->perm | new_perm,
~s->shared_perm | ~new_shared, ~s->shared_perm | ~new_shared,
false, errp); false, errp);
if (!ret) { if (!ret) {
ret = raw_check_lock_bytes(s, new_perm, new_shared, errp); ret = raw_check_lock_bytes(s->lock_fd, new_perm, new_shared, errp);
if (!ret) { if (!ret) {
return 0; return 0;
} }
@ -764,7 +763,8 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
op = RAW_PL_ABORT; op = RAW_PL_ABORT;
/* fall through to unlock bytes. */ /* fall through to unlock bytes. */
case RAW_PL_ABORT: case RAW_PL_ABORT:
raw_apply_lock_bytes(s, s->perm, ~s->shared_perm, true, &local_err); raw_apply_lock_bytes(s->lock_fd, s->perm, ~s->shared_perm,
true, &local_err);
if (local_err) { if (local_err) {
/* Theoretically the above call only unlocks bytes and it cannot /* Theoretically the above call only unlocks bytes and it cannot
* fail. Something weird happened, report it. * fail. Something weird happened, report it.
@ -773,7 +773,8 @@ static int raw_handle_perm_lock(BlockDriverState *bs,
} }
break; break;
case RAW_PL_COMMIT: case RAW_PL_COMMIT:
raw_apply_lock_bytes(s, new_perm, ~new_shared, true, &local_err); raw_apply_lock_bytes(s->lock_fd, new_perm, ~new_shared,
true, &local_err);
if (local_err) { if (local_err) {
/* Theoretically the above call only unlocks bytes and it cannot /* Theoretically the above call only unlocks bytes and it cannot
* fail. Something weird happened, report it. * fail. Something weird happened, report it.