opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-14 18:19:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor in latest containers/(storage,common,image)

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2022-04-21 15:15:41 -04:00
parent 121dde6234
commit 17105028e5
54 changed files with 439 additions and 2083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containers/storage/drivers/zfs/zfs.go generated vendored
View File

@@ -344,7 +344,7 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts) error {
return errors.Wrap(err, "error creating zfs mount")
}
defer func() {
if err := unix.Unmount(mountpoint, unix.MNT_DETACH); err != nil {
if err := detachUnmount(mountpoint); err != nil {
logrus.Warnf("Failed to unmount %s mount %s: %v", id, mountpoint, err)
}
}()
@@ -483,7 +483,7 @@ func (d *Driver) Put(id string) error {
logger.Debugf(`unmount("%s")`, mountpoint)
if err := unix.Unmount(mountpoint, unix.MNT_DETACH); err != nil {
if err := detachUnmount(mountpoint); err != nil {
logger.Warnf("Failed to unmount %s mount %s: %v", id, mountpoint, err)
}
if err := unix.Rmdir(mountpoint); err != nil && !os.IsNotExist(err) {