|
@@ -16,7 +16,7 @@ import (
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
|
|
|
|
- v1 "github.com/containerd/cgroups/stats/v1"
|
|
|
|
|
|
+ statsV1 "github.com/containerd/cgroups/stats/v1"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/blkiodev"
|
|
"github.com/docker/docker/api/types/blkiodev"
|
|
pblkiodev "github.com/docker/docker/api/types/blkiodev"
|
|
pblkiodev "github.com/docker/docker/api/types/blkiodev"
|
|
@@ -1376,7 +1376,7 @@ func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container
|
|
return daemon.Unmount(container)
|
|
return daemon.Unmount(container)
|
|
}
|
|
}
|
|
|
|
|
|
-func copyBlkioEntry(entries []*v1.BlkIOEntry) []types.BlkioStatEntry {
|
|
|
|
|
|
+func copyBlkioEntry(entries []*statsV1.BlkIOEntry) []types.BlkioStatEntry {
|
|
out := make([]types.BlkioStatEntry, len(entries))
|
|
out := make([]types.BlkioStatEntry, len(entries))
|
|
for i, re := range entries {
|
|
for i, re := range entries {
|
|
out[i] = types.BlkioStatEntry{
|
|
out[i] = types.BlkioStatEntry{
|