Merge pull request #14471 from icecrime/14451_devmapper_startup_panic

Fix panic on devicemapper initialization
Upstream-commit: 3833c990e70fa691ce7d609740094e88e1a37af7
Component: engine

components/engine/daemon/graphdriver/devmapper/deviceset.go

@@ -691,6 +691,9 @@ func getDeviceUUID(device string) (string, error) {
 }
 
 func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
+	devices.Lock()
+	defer devices.Unlock()
+
 	if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
 		return err
 	}
@@ -710,6 +713,9 @@ func (devices *DeviceSet) verifyBaseDeviceUUID(baseInfo *DevInfo) error {
 }
 
 func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *DevInfo) error {
+	devices.Lock()
+	defer devices.Unlock()
+
 	if err := devices.activateDeviceIfNeeded(baseInfo); err != nil {
 		return err
 	}