From 69051ec0a58906e5252f902063ccead2075c8bed Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Tue, 6 Oct 2015 08:38:03 -0400 Subject: [PATCH] devmapper: Move thin pool related checks in a function Move thin pool related checks in a separate function. Pure code reorganization. Makes reading code easier. Signed-off-by: Vivek Goyal --- daemon/graphdriver/devmapper/deviceset.go | 27 ++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index 4d0923975..3f2de920f 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -809,6 +809,22 @@ func (devices *DeviceSet) createBaseImage() error { return nil } +func (devices *DeviceSet) checkThinPool() error { + _, transactionID, dataUsed, _, _, _, err := devices.poolStatus() + if err != nil { + return err + } + 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) + } + return nil +} + func (devices *DeviceSet) setupBaseImage() error { oldInfo, _ := devices.lookupDeviceWithLock("") if oldInfo != nil && oldInfo.Initialized { @@ -835,18 +851,9 @@ func (devices *DeviceSet) setupBaseImage() error { } if devices.thinPoolDevice != "" && oldInfo == nil { - _, transactionID, dataUsed, _, _, _, err := devices.poolStatus() - if err != nil { + if err := devices.checkThinPool(); err != nil { return err } - 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) - } } // Create new base image device