GitList

Browse code

devmapper: Use removeDeviceAndWait in DeviceSet.removeDevice()

This makes sure the device is removed just like in deactivateDevice.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

Alexander Larsson authored on 2014/02/05 00:08:45
Showing 1 changed files

graphdriver/devmapper/deviceset.go index 4d708c8..4955fb5 100644

graphdriver/devmapper/deviceset.go

History View file @ 7e25cd5

@@ -595,7 +595,7 @@ func (devices *DeviceSet) deleteDevice(hash string) error {
                      	devinfo, _ := getInfo(info.Name())
                      	if devinfo != nil && devinfo.Exists != 0 {
                     -		if err := removeDevice(info.Name()); err != nil {
                     +		if err := devices.removeDeviceAndWait(info.Name()); err != nil {
                      			utils.Debugf("Error removing device: %s\n", err)
                      			return err
+                     		}