diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-06-25 14:02:49 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-06-25 14:02:49 -0400 |
commit | 90b835db69d589de559462d988cb3fae5cf1ef49 (patch) | |
tree | 1ca86a1bb3d0127ae8267467e8dff19c68046720 /vendor/github.com/containers/storage/drivers/btrfs | |
parent | 65fb42ad55647ebceb8057c4562da0d39da1382d (diff) | |
download | podman-90b835db69d589de559462d988cb3fae5cf1ef49.tar.gz podman-90b835db69d589de559462d988cb3fae5cf1ef49.tar.bz2 podman-90b835db69d589de559462d988cb3fae5cf1ef49.zip |
Update c/storage to 67bf6c9b41967780f4bcb5725c00283ad6397679
Pick up caching of overlay feature checks
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'vendor/github.com/containers/storage/drivers/btrfs')
-rw-r--r-- | vendor/github.com/containers/storage/drivers/btrfs/btrfs.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go b/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go index 30254d9fb..6f632a98d 100644 --- a/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go +++ b/vendor/github.com/containers/storage/drivers/btrfs/btrfs.go @@ -49,7 +49,7 @@ type btrfsOptions struct { // Init returns a new BTRFS driver. // An error is returned if BTRFS is not supported. -func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) { +func Init(home string, options graphdriver.Options) (graphdriver.Driver, error) { fsMagic, err := graphdriver.GetFSMagic(home) if err != nil { @@ -60,7 +60,7 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap return nil, errors.Wrapf(graphdriver.ErrPrerequisites, "%q is not on a btrfs filesystem", home) } - rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps) + rootUID, rootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps) if err != nil { return nil, err } @@ -72,15 +72,15 @@ func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (grap return nil, err } - opt, userDiskQuota, err := parseOptions(options) + opt, userDiskQuota, err := parseOptions(options.DriverOptions) if err != nil { return nil, err } driver := &Driver{ home: home, - uidMaps: uidMaps, - gidMaps: gidMaps, + uidMaps: options.UIDMaps, + gidMaps: options.GIDMaps, options: opt, } |