From 39081eb3aa8f715c1da6f798c6531efd7a8a494c Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Wed, 30 Sep 2015 18:54:06 -0400 Subject: [PATCH] devmapper: Use deactivateDevice() instead of removeDevice() in deleteDevice() Use deactivateDevice() instead of removeDevice() directly. This will make sure for device deletion, deferred removal is used if user has configured it in. Also this makes reading code litle easier as there is single function to remove a device and that is deactivateDevice(). Signed-off-by: Vivek Goyal --- daemon/graphdriver/devmapper/deviceset.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go index e96127a000..407eef9f87 100644 --- a/daemon/graphdriver/devmapper/deviceset.go +++ b/daemon/graphdriver/devmapper/deviceset.go @@ -1477,12 +1477,10 @@ func (devices *DeviceSet) deleteDevice(info *devInfo) error { } } - devinfo, _ := devicemapper.GetInfo(info.Name()) - if devinfo != nil && devinfo.Exists != 0 { - if err := devices.removeDevice(info.Name()); err != nil { - logrus.Debugf("Error removing device: %s", err) - return err - } + // Try to deactivate deivce in case it is active. + if err := devices.deactivateDevice(info); err != nil { + logrus.Debugf("Error deactivating device: %s", err) + return err } if err := devices.openTransaction(info.Hash, info.DeviceID); err != nil {