p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

devmapper: cleanup some extraneous branching in setupBaseImage()

Browse Source 
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: b9f1b0a7514c6e40e7048fb9206001259eb7c33c
Component: engine
This commit is contained in:
Mike Snitzer
2014-11-21 22:26:09 -05:00
parent b28ed4ddea
commit c836e22634
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/engine/daemon/graphdriver/devmapper/deviceset.go
View File

@ -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)
}
}