From c4e82bab7041a30205ed8a528cf43c46fce0173c Mon Sep 17 00:00:00 2001
From: Austin Vazquez <austin.vazquez@docker.com>
Date: Tue, 19 Aug 2025 08:12:34 -0500
Subject: [PATCH] api/types/volume: move `DiskUsage` type internal to daemon
 backend

Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
---
 api/types/volume/disk_usage.go                           | 8 --------
 daemon/daemon.go                                         | 3 +--
 daemon/disk_usage.go                                     | 7 +++----
 daemon/server/backend/disk_usage.go                      | 9 ++++++++-
 .../github.com/moby/moby/api/types/volume/disk_usage.go  | 8 --------
 5 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 api/types/volume/disk_usage.go
 delete mode 100644 vendor/github.com/moby/moby/api/types/volume/disk_usage.go

diff --git a/api/types/volume/disk_usage.go b/api/types/volume/disk_usage.go
deleted file mode 100644
index 3d716c6e00..0000000000
--- a/api/types/volume/disk_usage.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package volume
-
-// DiskUsage contains disk usage for volumes.
-type DiskUsage struct {
-	TotalSize   int64
-	Reclaimable int64
-	Items       []*Volume
-}
diff --git a/daemon/daemon.go b/daemon/daemon.go
index d4bb90296a..a8dae6d64a 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -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
diff --git a/daemon/disk_usage.go b/daemon/disk_usage.go
index 1c5ee1ae3b..1ba3990ba4 100644
--- a/daemon/disk_usage.go
+++ b/daemon/disk_usage.go
@@ -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 {
diff --git a/daemon/server/backend/disk_usage.go b/daemon/server/backend/disk_usage.go
index 211c874d56..6edb47c4f5 100644
--- a/daemon/server/backend/disk_usage.go
+++ b/daemon/server/backend/disk_usage.go
@@ -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
+}
diff --git a/vendor/github.com/moby/moby/api/types/volume/disk_usage.go b/vendor/github.com/moby/moby/api/types/volume/disk_usage.go
deleted file mode 100644
index 3d716c6e00..0000000000
--- a/vendor/github.com/moby/moby/api/types/volume/disk_usage.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package volume
-
-// DiskUsage contains disk usage for volumes.
-type DiskUsage struct {
-	TotalSize   int64
-	Reclaimable int64
-	Items       []*Volume
-}