deleted file mode 100644

@@ -1,8 +0,0 @@

-package volume

-

-// DiskUsage contains disk usage for volumes.

-type DiskUsage struct {

-	TotalSize   int64

-	Reclaimable int64

-	Items       []*Volume

-}

@@ -38,7 +38,6 @@ import (

 	networktypes "github.com/moby/moby/api/types/network"

 	registrytypes "github.com/moby/moby/api/types/registry"

 	"github.com/moby/moby/api/types/swarm"

-	volumetypes "github.com/moby/moby/api/types/volume"

 	"github.com/moby/sys/user"

 	"github.com/moby/sys/userns"

 	"github.com/pkg/errors"

@@ -136,7 +135,7 @@ type Daemon struct {

 	usageContainers singleflight.Group[struct{}, *backend.ContainerDiskUsage]

 	usageImages     singleflight.Group[struct{}, []*imagetypes.Summary]

-	usageVolumes    singleflight.Group[struct{}, *volumetypes.DiskUsage]

+	usageVolumes    singleflight.Group[struct{}, *backend.VolumeDiskUsage]

 	usageLayer      singleflight.Group[struct{}, int64]

 	pruneRunning atomic.Bool

@@ -7,7 +7,6 @@ import (

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/image"

-	"github.com/moby/moby/api/types/volume"

 	"github.com/moby/moby/v2/daemon/server/backend"

 	"github.com/pkg/errors"

 	"golang.org/x/sync/errgroup"

@@ -70,14 +69,14 @@ func (daemon *Daemon) imageDiskUsage(ctx context.Context) ([]*image.Summary, err

 // localVolumesSize obtains information about volume disk usage from volumes service

 // and makes sure that only one size calculation is performed at the same time.

-func (daemon *Daemon) localVolumesSize(ctx context.Context) (*volume.DiskUsage, error) {

-	volumes, _, err := daemon.usageVolumes.Do(ctx, struct{}{}, func(ctx context.Context) (*volume.DiskUsage, error) {

+func (daemon *Daemon) localVolumesSize(ctx context.Context) (*backend.VolumeDiskUsage, error) {

+	volumes, _, err := daemon.usageVolumes.Do(ctx, struct{}{}, func(ctx context.Context) (*backend.VolumeDiskUsage, error) {

 		volumes, err := daemon.volumes.LocalVolumesSize(ctx)

 		if err != nil {

 			return nil, err

 		}

-		du := &volume.DiskUsage{Items: volumes}

+		du := &backend.VolumeDiskUsage{Items: volumes}

 		for _, v := range du.Items {

 			if v.UsageData.Size != -1 {

 				if v.UsageData.RefCount == 0 {

@@ -24,7 +24,7 @@ type DiskUsageOptions struct {

 type DiskUsage struct {

 	Images     *ImageDiskUsage

 	Containers *ContainerDiskUsage

-	Volumes    *volume.DiskUsage

+	Volumes    *VolumeDiskUsage

 	BuildCache *BuildCacheDiskUsage

 }

@@ -48,3 +48,10 @@ type ImageDiskUsage struct {

 	Reclaimable int64

 	Items       []*image.Summary

 }

+

+// VolumeDiskUsage contains disk usage for volumes.

+type VolumeDiskUsage struct {

+	TotalSize   int64

+	Reclaimable int64

+	Items       []*volume.Volume

+}

deleted file mode 100644

@@ -1,8 +0,0 @@

-package volume

-

-// DiskUsage contains disk usage for volumes.

-type DiskUsage struct {

-	TotalSize   int64

-	Reclaimable int64

-	Items       []*Volume

-}