mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
devmapper: cleanup some extraneous branching in setupBaseImage()
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
This commit is contained in:
parent
553b50bd37
commit
b9f1b0a751
1 changed files with 10 additions and 9 deletions
|
@ -416,18 +416,19 @@ 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 {
|
||||
}
|
||||
if transactionId != 0 {
|
||||
return fmt.Errorf("Unable to take ownership of thin-pool (%s) with non-zero transaction Id",
|
||||
devices.thinPoolDevice)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log.Debugf("Initializing base device-mapper thin volume")
|
||||
|
||||
|
|
Loading…
Reference in a new issue