Skip to content

Commit b97db28

Browse files
dmcgowandmcgowan
committed
Update continuity vendor
Update golang sys/x Adds disk check context handling Adds fs error Removes unnecessary block in path cleanup Signed-off-by: Derek McGowan <derek@mcgstyle.net>
1 parent a9c2bd6 commit b97db28

File tree

280 files changed

+31488
-8790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+31488
-8790
lines changed

‎snapshots/btrfs/btrfs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (b *snapshotter) usage(ctx context.Context, key string) (snapshots.Usage, e
171171
if parentID != "" {
172172
du, err = fs.DiffUsage(ctx, filepath.Join(b.root, "snapshots", parentID), p)
173173
} else {
174-
du, err = fs.DiskUsage(p)
174+
du, err = fs.DiskUsage(ctx, p)
175175
}
176176
if err != nil {
177177
// TODO(stevvooe): Consider not reporting an error in this case.

‎snapshots/native/native.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (o *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, e
120120
}
121121

122122
if info.Kind == snapshots.KindActive {
123-
du, err := fs.DiskUsage(o.getSnapshotDir(id))
123+
du, err := fs.DiskUsage(ctx, o.getSnapshotDir(id))
124124
if err != nil {
125125
return snapshots.Usage{}, err
126126
}
@@ -166,7 +166,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
166166
return err
167167
}
168168

169-
usage, err := fs.DiskUsage(o.getSnapshotDir(id))
169+
usage, err := fs.DiskUsage(ctx, o.getSnapshotDir(id))
170170
if err != nil {
171171
return err
172172
}

‎snapshots/overlay/overlay.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func (o *snapshotter) Usage(ctx context.Context, key string) (snapshots.Usage, e
168168
upperPath := o.upperPath(id)
169169

170170
if info.Kind == snapshots.KindActive {
171-
du, err := fs.DiskUsage(upperPath)
171+
du, err := fs.DiskUsage(ctx, upperPath)
172172
if err != nil {
173173
// TODO(stevvooe): Consider not reporting an error in this case.
174174
return snapshots.Usage{}, err
@@ -225,7 +225,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
225225
return err
226226
}
227227

228-
usage, err := fs.DiskUsage(o.upperPath(id))
228+
usage, err := fs.DiskUsage(ctx, o.upperPath(id))
229229
if err != nil {
230230
return err
231231
}

‎vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130
44
github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
55
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
66
github.com/containerd/btrfs 2e1aa0ddf94f91fa282b6ed87c23bf0d64911244
7-
github.com/containerd/continuity a60600ad77f38aaa70165825f61e2ea72e51c9b1
7+
github.com/containerd/continuity 7f53d412b9eb1cbf744c2063185d703a0ee34700
88
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
99
github.com/docker/go-metrics 4ea375f7759c82740c893fc030bc37088d2ec098
1010
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
@@ -28,7 +28,7 @@ golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
2828
google.golang.org/grpc v1.10.1
2929
github.com/pkg/errors v0.8.0
3030
github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
31-
golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 https://github.com/golang/sys
31+
golang.org/x/sys 1b2967e3c290b7c545b3db0deeda16e9be4f98a2 https://github.com/golang/sys
3232
github.com/opencontainers/image-spec v1.0.1
3333
golang.org/x/sync 450f422ab23cf9881c94e2db30cac0eb1b7cf80c
3434
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
@@ -82,4 +82,4 @@ github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2
8282
github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd
8383

8484
# aufs dependencies
85-
github.com/containerd/aufs a7fbd554da7a9eafbe5a460a421313a9fd18d988
85+
github.com/containerd/aufs ffa39970e26ad01d81f540b21e65f9c1841a5f92

‎vendor/github.com/containerd/aufs/aufs.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/context.go‎

Lines changed: 41 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/devices/devices.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/devices/devices_unix.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/devices/devices_windows.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/digests.go‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)