opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 01:48:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: Move part of (*Container).stat to container_stat_linux.go

Browse Source 
The logic that treats running containers differently from stopped
containers is not needed on FreeBSD where the container mounts live in
a global mount namespace.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-08-25 08:23:54 +01:00
parent 0b02d4cee6
commit 75d6e7bae5
2 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libpod/container_stat_common.go
View File

@ -15,25 +15,6 @@ import (
"github.com/containers/podman/v4/pkg/copy" "github.com/containers/podman/v4/pkg/copy"
) )
// statInsideMount stats the specified path *inside* the container's mount and PID
// namespace. It returns the file info along with the resolved root ("/") and
// the resolved path (relative to the root).
func (c *Container) statInsideMount(containerPath string) (*copier.StatForItem, string, string, error) {
resolvedRoot := "/"
resolvedPath := c.pathAbs(containerPath)
var statInfo *copier.StatForItem
err := c.joinMountAndExec(
func() error {
var statErr error
statInfo, statErr = secureStat(resolvedRoot, resolvedPath)
return statErr
},
)
return statInfo, resolvedRoot, resolvedPath, err
}
// statOnHost stats the specified path *on the host*. It returns the file info // statOnHost stats the specified path *on the host*. It returns the file info
// along with the resolved root and the resolved path. Both paths are absolute // along with the resolved root and the resolved path. Both paths are absolute
// to the host's root. Note that the paths may resolved outside the // to the host's root. Note that the paths may resolved outside the
@ -72,16 +53,7 @@ func (c *Container) stat(containerMountPoint string, containerPath string) (*def
return nil, "", "", copy.ErrENOENT return nil, "", "", copy.ErrENOENT
} }
if c.state.State == define.ContainerStateRunning { statInfo, resolvedRoot, resolvedPath, statErr = c.statInContainer(containerMountPoint, containerPath)
// If the container is running, we need to join it's mount namespace
// and stat there.
statInfo, resolvedRoot, resolvedPath, statErr = c.statInsideMount(containerPath)
} else {
// If the container is NOT running, we need to resolve the path
// on the host.
statInfo, resolvedRoot, resolvedPath, statErr = c.statOnHost(containerMountPoint, containerPath)
}
if statErr != nil { if statErr != nil {
if statInfo == nil { if statInfo == nil {
return nil, "", "", statErr return nil, "", "", statErr

38
libpod/container_stat_linux.go Normal file
View File

@ -0,0 +1,38 @@
package libpod
import (
"github.com/containers/buildah/copier"
"github.com/containers/podman/v4/libpod/define"
)
// statInsideMount stats the specified path *inside* the container's mount and PID
// namespace. It returns the file info along with the resolved root ("/") and
// the resolved path (relative to the root).
func (c *Container) statInsideMount(containerPath string) (*copier.StatForItem, string, string, error) {
resolvedRoot := "/"
resolvedPath := c.pathAbs(containerPath)
var statInfo *copier.StatForItem
err := c.joinMountAndExec(
func() error {
var statErr error
statInfo, statErr = secureStat(resolvedRoot, resolvedPath)
return statErr
},
)
return statInfo, resolvedRoot, resolvedPath, err
}
// Calls either statOnHost or statInsideMount depending on whether the
// container is running
func (c *Container) statInContainer(mountPoint string, containerPath string) (*copier.StatForItem, string, string, error) {
if c.state.State == define.ContainerStateRunning {
// If the container is running, we need to join it's mount namespace
// and stat there.
return c.statInsideMount(containerPath)
}
// If the container is NOT running, we need to resolve the path
// on the host.
return c.statOnHost(mountPoint, containerPath)
}