Merge pull request #1577 from crosbymichael/lint-1

Update files based on go lint

cmd/containerd-shim/shim_linux.go

@@ -42,6 +42,7 @@ type unixSocketCredentials struct {
 	serverName string
 }
 
+// NewUnixSocketCredentials returns TransportCredentials for a local unix socket
 func NewUnixSocketCredentials(uid, gid int) credentials.TransportCredentials {
 	return &unixSocketCredentials{uid, gid, "locahost"}
 }

cmd/ctr/namespaces.go

@@ -44,12 +44,7 @@ var namespacesCreateCommand = cli.Command{
 		if err != nil {
 			return err
 		}
-
-		if err := namespaces.Create(ctx, namespace, labels); err != nil {
-			return err
-		}
-
-		return nil
+		return namespaces.Create(ctx, namespace, labels)
 	},
 }
 

cmd/ctr/ps.go

@@ -47,9 +47,6 @@ var taskPsCommand = cli.Command{
 				return err
 			}
 		}
-		if err := w.Flush(); err != nil {
-			return err
-		}
-		return nil
+		return w.Flush()
 	},
 }