From 68b9f5ddb1b72e714cfe5c4536cdf308f06de2e0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 4 Dec 2025 21:36:44 +0100 Subject: [PATCH] container/podman: fix `zfsFilesystem` and `zfsParent` being swapped. `DetermineDeviceStorage` was introduced in 1fb7f23f49ffbb9e3ee9a7c9d5d56d89dc9b2c74 and returns `rootfsStorageDir, zfsFilesystem, zfsParent`. But the PodMan implementation added in fea8256eaf46d74aab363ab898c1a1284869b692 assigns them to `rootfsStorageDir, zfsParent, zfsFilesystem`, so the `zfsParent` and `zfsFilesystem` being reversed. I'm not sure how to best verify this, but from the looks of it, that's a bug, so updating the code to assign the right values. Signed-off-by: Sebastiaan van Stijn --- container/podman/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/podman/handler.go b/container/podman/handler.go index 322d218cf9..41133969aa 100644 --- a/container/podman/handler.go +++ b/container/podman/handler.go @@ -118,7 +118,7 @@ func newPodmanContainerHandler( return nil, err } - rootfsStorageDir, zfsParent, zfsFilesystem, err := determineDeviceStorage(storageDriver, storageDir, rwLayerID) + rootfsStorageDir, zfsFilesystem, zfsParent, err := determineDeviceStorage(storageDriver, storageDir, rwLayerID) if err != nil { return nil, err }