mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #14471 from icecrime/14451_devmapper_startup_panic
Fix panic on devicemapper initialization
This commit is contained in:
commit
3833c990e7
1 changed files with 6 additions and 0 deletions
|
@ -691,6 +691,9 @@ func getDeviceUUID(device string) (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
|
func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
|
||||||
|
devices.Lock()
|
||||||
|
defer devices.Unlock()
|
||||||
|
|
||||||
if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
|
if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -710,6 +713,9 @@ func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *DevInfo) error {
|
func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *DevInfo) error {
|
||||||
|
devices.Lock()
|
||||||
|
defer devices.Unlock()
|
||||||
|
|
||||||
if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
|
if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue