From 93d3f065ac349684007bdbd4b692a65fc50e0023 Mon Sep 17 00:00:00 2001 From: Michael Wan Date: Wed, 29 Aug 2018 07:30:31 -0400 Subject: [PATCH] vendor: update vendor containerd/aufs to commit ffa3997 Signed-off-by: Michael Wan --- vendor.conf | 2 +- vendor/github.com/containerd/aufs/aufs.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index 38f8ed235..24fbb458c 100644 --- a/vendor.conf +++ b/vendor.conf @@ -85,4 +85,4 @@ github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2 github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd # aufs dependencies -github.com/containerd/aufs a7fbd554da7a9eafbe5a460a421313a9fd18d988 +github.com/containerd/aufs ffa39970e26ad01d81f540b21e65f9c1841a5f92 diff --git a/vendor/github.com/containerd/aufs/aufs.go b/vendor/github.com/containerd/aufs/aufs.go index cb3784d03..95d7f48af 100644 --- a/vendor/github.com/containerd/aufs/aufs.go +++ b/vendor/github.com/containerd/aufs/aufs.go @@ -117,7 +117,7 @@ func (o *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, e t.Rollback() // transaction no longer needed at this point. if info.Kind == snapshots.KindActive { - du, err := fs.DiskUsage(upperPath) + du, err := fs.DiskUsage(ctx, upperPath) if err != nil { // TODO(stevvooe): Consider not reporting an error in this case. return snapshots.Usage{}, err @@ -174,7 +174,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap return err } - usage, err := fs.DiskUsage(o.upperPath(id)) + usage, err := fs.DiskUsage(ctx, o.upperPath(id)) if err != nil { return err }