X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fpve%2F0001-PVE-Config-block-file-change-locking-default-to-off.patch;h=9d7bec1ff0dd967777c1237a51ada0c69dbd5f3e;hb=817b7667e80fbc08a3117c20be7166c790df7f82;hp=cdae87120642d5a17bd4daefc2cfff8e14a845a7;hpb=53e83913af9e99bcef3501055f65b797d34bdc7b;p=pve-qemu.git diff --git a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch index cdae871..9d7bec1 100644 --- a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch +++ b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller -Date: Wed, 29 Nov 2017 11:11:46 +0100 +Date: Mon, 6 Apr 2020 12:16:30 +0200 Subject: [PATCH] PVE: [Config] block/file: change locking default to off 'auto' only checks whether the system generally supports OFD @@ -8,15 +8,16 @@ locks but not whether the storage the file resides on supports any locking, causing issues with NFS. Signed-off-by: Wolfgang Bumiller +Signed-off-by: Thomas Lamprecht --- 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 fe83cbf0eb..431a9dddc6 100644 +index d5fd1dbcd2..bda3e606dc 100644 --- a/block/file-posix.c +++ b/block/file-posix.c -@@ -421,7 +421,7 @@ static QemuOptsList raw_runtime_opts = { +@@ -508,7 +508,7 @@ static QemuOptsList raw_runtime_opts = { { .name = "locking", .type = QEMU_OPT_STRING, @@ -25,7 +26,7 @@ index fe83cbf0eb..431a9dddc6 100644 }, { .name = "pr-manager", -@@ -503,7 +503,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, +@@ -606,7 +606,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, s->use_lock = false; break; case ON_OFF_AUTO_AUTO: @@ -34,6 +35,3 @@ index fe83cbf0eb..431a9dddc6 100644 break; default: abort(); --- -2.11.0 -