144 lines
5.2 KiB
Diff
144 lines
5.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:50 +0200
|
|
Subject: [PATCH] PVE: [Up+Config] file-posix: make locking optiono on create
|
|
|
|
Otherwise creating images on nfs/cifs can be problematic.
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/file-posix.c | 61 +++++++++++++++++++++++++++++---------------
|
|
qapi/block-core.json | 3 ++-
|
|
2 files changed, 43 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
|
index bda3e606dc..037839622e 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -2388,6 +2388,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
int fd;
|
|
uint64_t perm, shared;
|
|
int result = 0;
|
|
+ bool locked = false;
|
|
|
|
/* Validate options and set default values */
|
|
assert(options->driver == BLOCKDEV_DRIVER_FILE);
|
|
@@ -2428,19 +2429,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
|
|
shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
|
|
|
|
- /* Step one: Take locks */
|
|
- result = raw_apply_lock_bytes(NULL, fd, perm, ~shared, false, errp);
|
|
- if (result < 0) {
|
|
- goto out_close;
|
|
- }
|
|
+ if (file_opts->locking != ON_OFF_AUTO_OFF) {
|
|
+ /* Step one: Take locks */
|
|
+ result = raw_apply_lock_bytes(NULL, fd, perm, ~shared, false, errp);
|
|
+ if (result < 0) {
|
|
+ goto out_close;
|
|
+ }
|
|
+ locked = true;
|
|
|
|
- /* Step two: Check that nobody else has taken conflicting locks */
|
|
- result = raw_check_lock_bytes(fd, perm, shared, errp);
|
|
- if (result < 0) {
|
|
- error_append_hint(errp,
|
|
- "Is another process using the image [%s]?\n",
|
|
- file_opts->filename);
|
|
- goto out_unlock;
|
|
+ /* Step two: Check that nobody else has taken conflicting locks */
|
|
+ result = raw_check_lock_bytes(fd, perm, shared, errp);
|
|
+ if (result < 0) {
|
|
+ error_append_hint(errp,
|
|
+ "Is another process using the image [%s]?\n",
|
|
+ file_opts->filename);
|
|
+ goto out_unlock;
|
|
+ }
|
|
}
|
|
|
|
/* Clear the file by truncating it to 0 */
|
|
@@ -2494,13 +2498,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
|
|
}
|
|
|
|
out_unlock:
|
|
- raw_apply_lock_bytes(NULL, fd, 0, 0, true, &local_err);
|
|
- if (local_err) {
|
|
- /* The above call should not fail, and if it does, that does
|
|
- * not mean the whole creation operation has failed. So
|
|
- * report it the user for their convenience, but do not report
|
|
- * it to the caller. */
|
|
- warn_report_err(local_err);
|
|
+ if (locked) {
|
|
+ raw_apply_lock_bytes(NULL, fd, 0, 0, true, &local_err);
|
|
+ if (local_err) {
|
|
+ /* The above call should not fail, and if it does, that does
|
|
+ * not mean the whole creation operation has failed. So
|
|
+ * report it the user for their convenience, but do not report
|
|
+ * it to the caller. */
|
|
+ warn_report_err(local_err);
|
|
+ }
|
|
}
|
|
|
|
out_close:
|
|
@@ -2525,6 +2531,7 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
|
PreallocMode prealloc;
|
|
char *buf = NULL;
|
|
Error *local_err = NULL;
|
|
+ OnOffAuto locking;
|
|
|
|
/* Skip file: protocol prefix */
|
|
strstart(filename, "file:", &filename);
|
|
@@ -2547,6 +2554,18 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ locking = qapi_enum_parse(&OnOffAuto_lookup,
|
|
+ qemu_opt_get(opts, "locking"),
|
|
+ ON_OFF_AUTO_AUTO, &local_err);
|
|
+ if (local_err) {
|
|
+ error_propagate(errp, local_err);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
+ if (locking == ON_OFF_AUTO_AUTO) {
|
|
+ locking = ON_OFF_AUTO_OFF;
|
|
+ }
|
|
+
|
|
options = (BlockdevCreateOptions) {
|
|
.driver = BLOCKDEV_DRIVER_FILE,
|
|
.u.file = {
|
|
@@ -2558,6 +2577,8 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
|
|
.nocow = nocow,
|
|
.has_extent_size_hint = has_extent_size_hint,
|
|
.extent_size_hint = extent_size_hint,
|
|
+ .has_locking = true,
|
|
+ .locking = locking,
|
|
},
|
|
};
|
|
return raw_co_create(&options, errp);
|
|
@@ -3104,7 +3125,7 @@ static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t shared,
|
|
}
|
|
|
|
/* Copy locks to the new fd */
|
|
- if (s->perm_change_fd) {
|
|
+ if (s->use_lock && s->perm_change_fd) {
|
|
ret = raw_apply_lock_bytes(NULL, s->perm_change_fd, perm, ~shared,
|
|
false, errp);
|
|
if (ret < 0) {
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 04ad80bc1e..7957b9867d 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -4203,7 +4203,8 @@
|
|
'size': 'size',
|
|
'*preallocation': 'PreallocMode',
|
|
'*nocow': 'bool',
|
|
- '*extent-size-hint': 'size'} }
|
|
+ '*extent-size-hint': 'size',
|
|
+ '*locking': 'OnOffAuto' } }
|
|
|
|
##
|
|
# @BlockdevCreateOptionsGluster:
|