From 957b4d568450cd4d8ab30c3d20e64b4f4e2228ec Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Fri, 7 Nov 2014 16:53:34 -0500
Subject: [PATCH] devmapper: Take care of some review comments

Took care of some review comments from crosbymichael.

v2:
- Return "err = nil" if file deviceset-metadata file does not exist.
- Use json.Decoder() interface for loading deviceset metadata.

v3:
- Reverted back to json marshal interface in loadDeviceSetMetaData().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 15c74bebc1ea2d51612b5809b4477551547a8b3d
Component: engine
---
 .../daemon/graphdriver/devmapper/deviceset.go | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/components/engine/daemon/graphdriver/devmapper/deviceset.go b/components/engine/daemon/graphdriver/devmapper/deviceset.go
index 59c5ec82e7..125483f6c2 100644
--- a/components/engine/daemon/graphdriver/devmapper/deviceset.go
+++ b/components/engine/daemon/graphdriver/devmapper/deviceset.go
@@ -32,6 +32,8 @@ var (
 	DefaultThinpBlockSize       uint32 = 128 // 64K = 128 512b sectors
 )
 
+const deviceSetMetaFile string = "deviceset-metadata"
+
 type DevInfo struct {
 	Hash          string     `json:"-"`
 	DeviceId      int        `json:"device_id"`
@@ -139,7 +141,7 @@ func (devices *DeviceSet) metadataFile(info *DevInfo) string {
 }
 
 func (devices *DeviceSet) deviceSetMetaFile() string {
-	return path.Join(devices.metadataDir(), "deviceset-metadata")
+	return path.Join(devices.metadataDir(), deviceSetMetaFile)
 }
 
 func (devices *DeviceSet) oldMetadataFile() string {
@@ -236,8 +238,7 @@ func (devices *DeviceSet) saveMetadata(info *DevInfo) error {
 	if err != nil {
 		return fmt.Errorf("Error encoding metadata to json: %s", err)
 	}
-	err = devices.writeMetaFile(jsonData, devices.metadataFile(info))
-	if err != nil {
+	if err := devices.writeMetaFile(jsonData, devices.metadataFile(info)); err != nil {
 		return err
 	}
 
@@ -552,29 +553,24 @@ func (devices *DeviceSet) ResizePool(size int64) error {
 func (devices *DeviceSet) loadDeviceSetMetaData() error {
 	jsonData, err := ioutil.ReadFile(devices.deviceSetMetaFile())
 	if err != nil {
-		return nil
+		// For backward compatibility return success if file does
+		// not exist.
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return err
 	}
 
-	if err := json.Unmarshal(jsonData, devices); err != nil {
-		return nil
-	}
-
-	return nil
+	return json.Unmarshal(jsonData, devices)
 }
 
 func (devices *DeviceSet) saveDeviceSetMetaData() error {
 	jsonData, err := json.Marshal(devices)
-
 	if err != nil {
 		return fmt.Errorf("Error encoding metadata to json: %s", err)
 	}
 
-	err = devices.writeMetaFile(jsonData, devices.deviceSetMetaFile())
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return devices.writeMetaFile(jsonData, devices.deviceSetMetaFile())
 }
 
 func (devices *DeviceSet) initDevmapper(doInit bool) error {
@@ -710,7 +706,9 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error {
 
 	// Right now this loads only NextDeviceId. If there is more metatadata
 	// down the line, we might have to move it earlier.
-	devices.loadDeviceSetMetaData()
+	if err = devices.loadDeviceSetMetaData(); err != nil {
+		return err
+	}
 
 	// Setup the base image
 	if doInit {