fix redundant if ... error to make ci happy

Shukui Yang · Shukui Yang · commit b7b1be17efe4 · 2017-10-21T20:38:28.000+08:00
Signed-off-by: Shukui Yang &lt;yangshukui@huawei.com&gt;
diff --git 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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -152,10 +152,7 @@ func main() {`
`152`	`152`	`if p := context.GlobalString("pprof-address"); len(p) > 0 {`
`153`	`153`	`pprof.Enable(p)`
`154`	`154`	`}`
`155`		`- if err := checkLimits(); err != nil {`
`156`		`- return err`
`157`		`- }`
`158`		`- return nil`
	`155`	`+ return checkLimits()`
`159`	`156`	`}`
`160`	`157`
`161`	`158`	`app.Action = func(context *cli.Context) {`
Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,7 @@ func setup() error {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`
`30`		`- if err := os.MkdirAll(utils.BundlesRoot, 0755); err != nil {`
`31`		`- return err`
`32`		`- }`
`33`		`- return nil`
	`30`	`+ return os.MkdirAll(utils.BundlesRoot, 0755)`
`34`	`31`	`}`
`35`	`32`
`36`	`33`	`// Creates the bundleDir with rootfs, io fifo dir and a default spec.`