From a3d5b5a13c76e425bee970e1b486e5b940054739 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp@canonical.com>
Date: Thu, 19 Oct 2023 20:14:19 +0200
Subject: [PATCH] [lxd-import] lxd/patches: Only update volumes that need
 updating in patchStorageZfsUnsetInvalidBlockSettings

Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>
---
 cmd/incusd/patches.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cmd/incusd/patches.go b/cmd/incusd/patches.go
index 9dbc1f5df2..47b4614829 100644
--- a/cmd/incusd/patches.go
+++ b/cmd/incusd/patches.go
@@ -956,8 +956,18 @@ func patchStorageZfsUnsetInvalidBlockSettings(_ string, d *Daemon) error {
 				continue
 			}
 
-			delete(config, "block.filesystem")
-			delete(config, "block.mount_options")
+			update := false
+			for _, k := range []string{"block.filesystem", "block.mount_options"} {
+				_, found := config[k]
+				if found {
+					delete(config, k)
+					update = true
+				}
+			}
+
+			if !update {
+				continue
+			}
 
 			if vol.Type == db.StoragePoolVolumeTypeNameVM {
 				volType = volTypeVM