From c836e22634ff7a4f613a09d8162ea55d9734247e Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Fri, 21 Nov 2014 22:26:09 -0500 Subject: [PATCH] devmapper: cleanup some extraneous branching in setupBaseImage() Docker-DCO-1.1-Signed-off-by: Mike Snitzer (github: snitm) Upstream-commit: b9f1b0a7514c6e40e7048fb9206001259eb7c33c Component: engine --- .../daemon/graphdriver/devmapper/deviceset.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/components/engine/daemon/graphdriver/devmapper/deviceset.go b/components/engine/daemon/graphdriver/devmapper/deviceset.go index e4fa3e7195..b9d6e7616d 100644 --- a/components/engine/daemon/graphdriver/devmapper/deviceset.go +++ b/components/engine/daemon/graphdriver/devmapper/deviceset.go @@ -416,16 +416,17 @@ func (devices *DeviceSet) setupBaseImage() error { } if devices.thinPoolDevice != "" && oldInfo == nil { - if _, transactionId, dataUsed, _, _, _, err := devices.poolStatus(); err != nil { + _, transactionId, dataUsed, _, _, _, err := devices.poolStatus() + if err != nil { return err - } else { - if dataUsed != 0 { - return fmt.Errorf("Unable to take ownership of thin-pool (%s) that already has used data blocks", - devices.thinPoolDevice) - } else if transactionId != 0 { - return fmt.Errorf("Unable to take ownership of thin-pool (%s) with non-zero transaction Id", - devices.thinPoolDevice) - } + } + if dataUsed != 0 { + return fmt.Errorf("Unable to take ownership of thin-pool (%s) that already has used data blocks", + devices.thinPoolDevice) + } + if transactionId != 0 { + return fmt.Errorf("Unable to take ownership of thin-pool (%s) with non-zero transaction Id", + devices.thinPoolDevice) } }