0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19241 from rhvgoyal/fix-device-id-free

Browse source 
Mark device ID free only if device actually got deleted
This commit is contained in:
David Calavera 2016-01-13 13:07:39 -08:00
commit d6e01e3337
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/graphdriver/devmapper/deviceset.go
View file

@ -1801,6 +1801,7 @@ func (devices *DeviceSet) deleteTransaction(info *devInfo, syncDelete bool) erro
if info.Deleted {
devices.nrDeletedDevices--
}
devices.markDeviceIDFree(info.DeviceID)
} else {
if err := devices.markForDeferredDeletion(info); err != nil {
return err
@ -1855,8 +1856,6 @@ func (devices *DeviceSet) deleteDevice(info *devInfo, syncDelete bool) error {
return err
}
devices.markDeviceIDFree(info.DeviceID)
return nil
}