From ac917d33bde7e8f07482c4c5270f7d3ff069bb6f Mon Sep 17 00:00:00 2001 From: Anes Hasicic Date: Wed, 25 Mar 2015 09:53:04 +0100 Subject: [PATCH] Fixed redundant else in GetDeviceStatus Signed-off-by: Anes Hasicic Upstream-commit: e479e1c9f7d327f396eebc46d446cf4ee34513f7 Component: engine --- .../engine/daemon/graphdriver/devmapper/deviceset.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/components/engine/daemon/graphdriver/devmapper/deviceset.go b/components/engine/daemon/graphdriver/devmapper/deviceset.go index 686d72b951..98980cc881 100644 --- a/components/engine/daemon/graphdriver/devmapper/deviceset.go +++ b/components/engine/daemon/graphdriver/devmapper/deviceset.go @@ -1549,14 +1549,16 @@ func (devices *DeviceSet) GetDeviceStatus(hash string) (*DevStatus, error) { return nil, fmt.Errorf("Error activating devmapper device for '%s': %s", hash, err) } - if sizeInSectors, mappedSectors, highestMappedSector, err := devices.deviceStatus(info.DevName()); err != nil { + sizeInSectors, mappedSectors, highestMappedSector, err := devices.deviceStatus(info.DevName()) + + if err != nil { return nil, err - } else { - status.SizeInSectors = sizeInSectors - status.MappedSectors = mappedSectors - status.HighestMappedSector = highestMappedSector } + status.SizeInSectors = sizeInSectors + status.MappedSectors = mappedSectors + status.HighestMappedSector = highestMappedSector + return status, nil }