From b7b1be17efe4e5b2c02b203202bb2edff735e133 Mon Sep 17 00:00:00 2001
From: Shukui Yang <yangshukui@huawei.com>
Date: Sat, 21 Oct 2017 20:38:28 +0800
Subject: [PATCH] fix redundant if ... error to make ci happy

Signed-off-by: Shukui Yang <yangshukui@huawei.com>
---
 containerd/main.go      | 5 +----
 runtime/runtime_test.go | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/containerd/main.go b/containerd/main.go
index 6db46f8ac7..88e5f784ce 100644
--- a/containerd/main.go
+++ b/containerd/main.go
@@ -152,10 +152,7 @@ func main() {
 		if p := context.GlobalString("pprof-address"); len(p) > 0 {
 			pprof.Enable(p)
 		}
-		if err := checkLimits(); err != nil {
-			return err
-		}
-		return nil
+		return checkLimits()
 	}
 
 	app.Action = func(context *cli.Context) {
diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go
index 98c8e4e81d..ef52a3e49e 100644
--- a/runtime/runtime_test.go
+++ b/runtime/runtime_test.go
@@ -27,10 +27,7 @@ func setup() error {
 		return err
 	}
 
-	if err := os.MkdirAll(utils.BundlesRoot, 0755); err != nil {
-		return err
-	}
-	return nil
+	return os.MkdirAll(utils.BundlesRoot, 0755)
 }
 
 // Creates the bundleDir with rootfs, io fifo dir and a default spec.