From 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 10 Nov 2015 09:20:59 -0800 Subject: [PATCH] daemon/info.go: remove check for map nilness Signed-off-by: Alexander Morozov --- daemon/info.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/daemon/info.go b/daemon/info.go index 2ef7b668b7..3f61b40a81 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -19,13 +19,6 @@ import ( // SystemInfo returns information about the host server the daemon is running on. func (daemon *Daemon) SystemInfo() (*types.Info, error) { - images := daemon.Graph().Map() - var imgcount int - if images == nil { - imgcount = 0 - } else { - imgcount = len(images) - } kernelVersion := "" if kv, err := kernel.GetKernelVersion(); err == nil { kernelVersion = kv.String() @@ -66,7 +59,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { v := &types.Info{ ID: daemon.ID, Containers: len(daemon.List()), - Images: imgcount, + Images: len(daemon.Graph().Map()), Driver: daemon.GraphDriver().String(), DriverStatus: daemon.GraphDriver().Status(), IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled,