From ad2fbd9e873915d9d09685887eb0afe16b9559a4 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 17 Oct 2013 01:49:51 +0000 Subject: [PATCH] devmapper: error reporting workaround in waitRemove() --- devmapper/deviceset_devmapper.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devmapper/deviceset_devmapper.go b/devmapper/deviceset_devmapper.go index f2c2e4853a..309a26db79 100644 --- a/devmapper/deviceset_devmapper.go +++ b/devmapper/deviceset_devmapper.go @@ -553,7 +553,9 @@ func (devices *DeviceSetDM) waitRemove(hash string) error { for ; i<1000; i+=1 { devinfo, err := getInfo(devname) if err != nil { - return err + // If there is an error we assume the device doesn't exist. + // The error might actually be something else, but we can't differentiate. + return nil } utils.Debugf("Waiting for removal of %s: exists=%d", devname, devinfo.Exists) if devinfo.Exists == 0 {