Carry #21567

Use `LabeledVolume` interface type instead of manual interface.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 6d787dae1ae3cd4f2ca062b67592158597f9d40e
Component: engine

components/engine/daemon/list.go

@@ -589,18 +589,12 @@ func (daemon *Daemon) filterVolumes(vols []volume.Volume, filter filters.Args) (
 			}
 		}
 		if filter.Include("label") {
-			v, err := daemon.volumes.Get(vol.Name())
-			if err != nil {
-				return nil, err
+			v, ok := vol.(volume.LabeledVolume)
+			if !ok {
+				continue
 			}
-			if v, ok := v.(interface {
-				Labels() map[string]string
-			}); ok {
-				labels := v.Labels()
-
-				if !filter.MatchKVList("label", labels) {
-					continue
-				}
+			if !filter.MatchKVList("label", v.Labels()) {
+				continue
 			}
 		}
 		retVols = append(retVols, vol)