From efc1ddd7e3341124a2ebbb8a358f44754b32f310 Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Tue, 6 Oct 2015 08:38:03 -0400
Subject: [PATCH] devmapper: Move base device creation in separate function

This moves base device creation function in a separate function. Pure
code reorganization. Makes reading code little easier.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
---
 daemon/graphdriver/devmapper/deviceset.go | 59 +++++++++++++----------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go
index bdbd7720fa..4d0923975b 100644
--- a/daemon/graphdriver/devmapper/deviceset.go
+++ b/daemon/graphdriver/devmapper/deviceset.go
@@ -777,6 +777,38 @@ func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *devInfo) error {
 	return nil
 }
 
+func (devices *DeviceSet) createBaseImage() error {
+	logrus.Debugf("Initializing base device-mapper thin volume")
+
+	// Create initial device
+	info, err := devices.createRegisterDevice("")
+	if err != nil {
+		return err
+	}
+
+	logrus.Debugf("Creating filesystem on base device-mapper thin volume")
+
+	if err := devices.activateDeviceIfNeeded(info); err != nil {
+		return err
+	}
+
+	if err := devices.createFilesystem(info); err != nil {
+		return err
+	}
+
+	info.Initialized = true
+	if err := devices.saveMetadata(info); err != nil {
+		info.Initialized = false
+		return err
+	}
+
+	if err := devices.saveBaseDeviceUUID(info); err != nil {
+		return fmt.Errorf("Could not query and save base device UUID:%v", err)
+	}
+
+	return nil
+}
+
 func (devices *DeviceSet) setupBaseImage() error {
 	oldInfo, _ := devices.lookupDeviceWithLock("")
 	if oldInfo != nil && oldInfo.Initialized {
@@ -817,34 +849,11 @@ func (devices *DeviceSet) setupBaseImage() error {
 		}
 	}
 
-	logrus.Debugf("Initializing base device-mapper thin volume")
-
-	// Create initial device
-	info, err := devices.createRegisterDevice("")
-	if err != nil {
+	// Create new base image device
+	if err := devices.createBaseImage(); err != nil {
 		return err
 	}
 
-	logrus.Debugf("Creating filesystem on base device-mapper thin volume")
-
-	if err := devices.activateDeviceIfNeeded(info); err != nil {
-		return err
-	}
-
-	if err := devices.createFilesystem(info); err != nil {
-		return err
-	}
-
-	info.Initialized = true
-	if err := devices.saveMetadata(info); err != nil {
-		info.Initialized = false
-		return err
-	}
-
-	if err := devices.saveBaseDeviceUUID(info); err != nil {
-		return fmt.Errorf("Could not query and save base device UUID:%v", err)
-	}
-
 	return nil
 }