From 8d232fdb6812e5b53f57df506e42b6808e50d3c8 Mon Sep 17 00:00:00 2001
From: Boaz Shuster <ripcurld.github@gmail.com>
Date: Fri, 30 Jun 2017 11:04:35 +0300
Subject: [PATCH] Refactor MountPoint Setup function in volume.go

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: fb8b27cd41c92c9a739be70dee11f6e6ffffafdf
Component: engine
---
 components/engine/volume/volume.go | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/components/engine/volume/volume.go b/components/engine/volume/volume.go
index 07176b89ce..2de248aa5f 100644
--- a/components/engine/volume/volume.go
+++ b/components/engine/volume/volume.go
@@ -153,20 +153,18 @@ func (m *MountPoint) Cleanup() error {
 // before creating the source directory on the host.
 func (m *MountPoint) Setup(mountLabel string, rootIDs idtools.IDPair, checkFun func(m *MountPoint) error) (path string, err error) {
 	defer func() {
-		if err == nil {
-			if label.RelabelNeeded(m.Mode) {
-				if err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil {
-					if err == syscall.ENOTSUP {
-						err = nil
-						return
-					}
-					path = ""
-					err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source)
-					return
-				}
-			}
+		if err != nil || !label.RelabelNeeded(m.Mode) {
+			return
+		}
+
+		err = label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode))
+		if err == syscall.ENOTSUP {
+			err = nil
+		}
+		if err != nil {
+			path = ""
+			err = errors.Wrapf(err, "error setting label on mount source '%s'", m.Source)
 		}
-		return
 	}()
 
 	if m.Volume != nil {