Bump github.com/containers/storage from 1.16.2 to 1.16.3

Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.16.2 to 1.16.3.
- [Release notes](https://github.com/containers/storage/releases)
- [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md)
- [Commits](https://github.com/containers/storage/compare/v1.16.2...v1.16.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

vendor/github.com/containers/storage/drivers/chown.go

@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/containers/storage/pkg/reexec"
+	"github.com/opencontainers/selinux/pkg/pwalk"
 )
 
 const (
@@ -51,16 +51,13 @@ func chownByMapsMain() {
 	if len(toHost.UIDs()) == 0 && len(toHost.GIDs()) == 0 {
 		toHost = nil
 	}
-	chown := func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return fmt.Errorf("error walking to %q: %v", path, err)
-		}
+	chown := func(path string, info os.FileInfo, _ error) error {
 		if path == "." {
 			return nil
 		}
 		return platformLChown(path, info, toHost, toContainer)
 	}
-	if err := filepath.Walk(".", chown); err != nil {
+	if err := pwalk.Walk(".", chown); err != nil {
 		fmt.Fprintf(os.Stderr, "error during chown: %v", err)
 		os.Exit(1)
 	}

vendor/github.com/containers/storage/drivers/chown_unix.go

@@ -12,66 +12,63 @@ import (
 )
 
 func platformLChown(path string, info os.FileInfo, toHost, toContainer *idtools.IDMappings) error {
-	sysinfo := info.Sys()
-	if st, ok := sysinfo.(*syscall.Stat_t); ok {
-		// Map an on-disk UID/GID pair from host to container
-		// using the first map, then back to the host using the
-		// second map.  Skip that first step if they're 0, to
-		// compensate for cases where a parent layer should
-		// have had a mapped value, but didn't.
-		uid, gid := int(st.Uid), int(st.Gid)
-		if toContainer != nil {
-			pair := idtools.IDPair{
-				UID: uid,
-				GID: gid,
-			}
-			mappedUID, mappedGID, err := toContainer.ToContainer(pair)
-			if err != nil {
-				if (uid != 0) || (gid != 0) {
-					return fmt.Errorf("error mapping host ID pair %#v for %q to container: %v", pair, path, err)
-				}
-				mappedUID, mappedGID = uid, gid
-			}
-			uid, gid = mappedUID, mappedGID
+	st, ok := info.Sys().(*syscall.Stat_t)
+	if !ok {
+		return nil
+	}
+	// Map an on-disk UID/GID pair from host to container
+	// using the first map, then back to the host using the
+	// second map.  Skip that first step if they're 0, to
+	// compensate for cases where a parent layer should
+	// have had a mapped value, but didn't.
+	uid, gid := int(st.Uid), int(st.Gid)
+	if toContainer != nil {
+		pair := idtools.IDPair{
+			UID: uid,
+			GID: gid,
 		}
-		if toHost != nil {
-			pair := idtools.IDPair{
-				UID: uid,
-				GID: gid,
+		mappedUID, mappedGID, err := toContainer.ToContainer(pair)
+		if err != nil {
+			if (uid != 0) || (gid != 0) {
+				return fmt.Errorf("error mapping host ID pair %#v for %q to container: %v", pair, path, err)
 			}
-			mappedPair, err := toHost.ToHost(pair)
-			if err != nil {
-				return fmt.Errorf("error mapping container ID pair %#v for %q to host: %v", pair, path, err)
-			}
-			uid, gid = mappedPair.UID, mappedPair.GID
+			mappedUID, mappedGID = uid, gid
+		}
+		uid, gid = mappedUID, mappedGID
+	}
+	if toHost != nil {
+		pair := idtools.IDPair{
+			UID: uid,
+			GID: gid,
+		}
+		mappedPair, err := toHost.ToHost(pair)
+		if err != nil {
+			return fmt.Errorf("error mapping container ID pair %#v for %q to host: %v", pair, path, err)
+		}
+		uid, gid = mappedPair.UID, mappedPair.GID
+	}
+	if uid != int(st.Uid) || gid != int(st.Gid) {
+		cap, err := system.Lgetxattr(path, "security.capability")
+		if err != nil && err != system.ErrNotSupportedPlatform {
+			return fmt.Errorf("%s: Lgetxattr(%q): %v", os.Args[0], path, err)
 		}
-		if uid != int(st.Uid) || gid != int(st.Gid) {
-			stat, err := os.Lstat(path)
-			if err != nil {
-				return fmt.Errorf("%s: lstat(%q): %v", os.Args[0], path, err)
-			}
-			cap, err := system.Lgetxattr(path, "security.capability")
-			if err != nil && err != system.ErrNotSupportedPlatform {
-				return fmt.Errorf("%s: Lgetxattr(%q): %v", os.Args[0], path, err)
-			}
-
-			// Make the change.
-			if err := syscall.Lchown(path, uid, gid); err != nil {
-				return fmt.Errorf("%s: chown(%q): %v", os.Args[0], path, err)
-			}
-			// Restore the SUID and SGID bits if they were originally set.
-			if (stat.Mode()&os.ModeSymlink == 0) && stat.Mode()&(os.ModeSetuid|os.ModeSetgid) != 0 {
-				if err := os.Chmod(path, stat.Mode()); err != nil {
-					return fmt.Errorf("%s: chmod(%q): %v", os.Args[0], path, err)
-				}
-			}
-			if cap != nil {
-				if err := system.Lsetxattr(path, "security.capability", cap, 0); err != nil {
-					return fmt.Errorf("%s: Lsetxattr(%q): %v", os.Args[0], path, err)
-				}
-			}
 
+		// Make the change.
+		if err := syscall.Lchown(path, uid, gid); err != nil {
+			return fmt.Errorf("%s: chown(%q): %v", os.Args[0], path, err)
 		}
+		// Restore the SUID and SGID bits if they were originally set.
+		if (info.Mode()&os.ModeSymlink == 0) && info.Mode()&(os.ModeSetuid|os.ModeSetgid) != 0 {
+			if err := os.Chmod(path, info.Mode()); err != nil {
+				return fmt.Errorf("%s: chmod(%q): %v", os.Args[0], path, err)
+			}
+		}
+		if cap != nil {
+			if err := system.Lsetxattr(path, "security.capability", cap, 0); err != nil {
+				return fmt.Errorf("%s: Lsetxattr(%q): %v", os.Args[0], path, err)
+			}
+		}
+
 	}
 	return nil
 }

vendor/github.com/containers/storage/drivers/devmapper/deviceset.go

@@ -1209,7 +1209,7 @@ func (devices *DeviceSet) growFS(info *devInfo) error {
 	options = joinMountOptions(options, devices.mountOptions)
 
 	if err := mount.Mount(info.DevName(), fsMountPoint, devices.BaseDeviceFilesystem, options); err != nil {
-		return fmt.Errorf("Error mounting '%s' on '%s': %s\n%v", info.DevName(), fsMountPoint, err, string(dmesg.Dmesg(256)))
+		return errors.Wrapf(err, "Failed to mount; dmesg: %s", string(dmesg.Dmesg(256)))
 	}
 
 	defer unix.Unmount(fsMountPoint, unix.MNT_DETACH)
@@ -2414,7 +2414,7 @@ func (devices *DeviceSet) MountDevice(hash, path string, moptions graphdriver.Mo
 	options = joinMountOptions(options, label.FormatMountLabel("", moptions.MountLabel))
 
 	if err := mount.Mount(info.DevName(), path, fstype, options); err != nil {
-		return fmt.Errorf("devmapper: Error mounting '%s' on '%s': %s\n%v", info.DevName(), path, err, string(dmesg.Dmesg(256)))
+		return errors.Wrapf(err, "Failed to mount; dmesg: %s", string(dmesg.Dmesg(256)))
 	}
 
 	if fstype == xfs && devices.xfsNospaceRetries != "" {