docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14471 from icecrime/14451_devmapper_startup_panic 

Fix panic on devicemapper initialization
This commit is contained in:
David Calavera 2015-07-08 11:18:00 -06:00
parent f5ebcfe1dc f089899023
commit 3833c990e7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/graphdriver/devmapper/deviceset.go
View File

@ -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
} }