lxd/patches: Only update volumes that need updating in patchStorageZf…

…sUnsetInvalidBlockSettings

Signed-off-by: Thomas Hipp <thomas.hipp@canonical.com>

lxd/patches.go

@@ -996,8 +996,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