From cff980c7fc8ddeea67fdb3fd9243b8a86a2bcaa1 Mon Sep 17 00:00:00 2001
From: Solomon Hykes <solomon@dotcloud.com>
Date: Thu, 17 Oct 2013 01:49:27 +0000
Subject: [PATCH] devmapper: small fixes in error reporting Upstream-commit:
 e5d7472a0d0268957eebbc385005d6b69c442270 Component: engine

---
 components/engine/devmapper/deviceset_devmapper.go | 3 +--
 components/engine/devmapper/devmapper.go           | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/engine/devmapper/deviceset_devmapper.go b/components/engine/devmapper/deviceset_devmapper.go
index da59bba6c8..f2c2e4853a 100644
--- a/components/engine/devmapper/deviceset_devmapper.go
+++ b/components/engine/devmapper/deviceset_devmapper.go
@@ -365,8 +365,7 @@ func (devices *DeviceSetDM) initDevmapper() error {
 
 	st, err := os.Stat(data)
 	if err != nil {
-		utils.Debugf("\n--->Err: %s\n", err)
-		return err
+		return fmt.Errorf("Error looking up data image %s: %s", data, err)
 	}
 	sysSt := st.Sys().(*syscall.Stat_t)
 	// "reg-" stands for "regular file".
diff --git a/components/engine/devmapper/devmapper.go b/components/engine/devmapper/devmapper.go
index 021661159c..8600c09e8f 100644
--- a/components/engine/devmapper/devmapper.go
+++ b/components/engine/devmapper/devmapper.go
@@ -247,9 +247,6 @@ func (t *Task) SetName(name string) error {
 	defer free(c_name)
 
 	if res := C.dm_task_set_name(t.unmanaged, c_name); res != 1 {
-		if os.Getenv("DEBUG") != "" {
-			C.perror(C.CString(fmt.Sprintf("[debug] Error dm_task_set_name(%s, %#v)", name, t.unmanaged)))
-		}
 		return ErrTaskSetName
 	}
 	return nil