update containerd

AkihiroSuda · crosbymichael · commit ffa39970e26a · 2018-07-24T12:19:21.000-04:00
Signed-off-by: Akihiro Suda &lt;suda.akihiro@lab.ntt.co.jp&gt;
diff --git a/aufs.go b/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
 	}
diff --git a/aufs_test.go b/aufs_test.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"testing"
 
+	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/testsuite"
-	"github.com/containerd/containerd/testutil"
 )
 
 func TestAufs(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"testing"`
`6`	`6`
	`7`	`+ "github.com/containerd/containerd/pkg/testutil"`
`7`	`8`	`"github.com/containerd/containerd/snapshots"`
`8`	`9`	`"github.com/containerd/containerd/snapshots/testsuite"`
`9`		`- "github.com/containerd/containerd/testutil"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func TestAufs(t *testing.T) {`