diff --git a/archive/tar_linux.go b/archive/tar_linux.go
index 3b855af..f4b6a09 100644
--- a/archive/tar_linux.go
+++ b/archive/tar_linux.go
@@ -100,10 +100,7 @@ func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
 		mode |= syscall.S_IFIFO
 	}
 
-	if err := syscall.Mknod(path, mode, int(mkdev(hdr.Devmajor, hdr.Devminor))); err != nil {
-		return err
-	}
-	return nil
+	return syscall.Mknod(path, mode, int(mkdev(hdr.Devmajor, hdr.Devminor)))
 }
 
 func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
diff --git a/cmd/ctr/pprof.go b/cmd/ctr/pprof.go
index c0d54f2..88da7d9 100644
--- a/cmd/ctr/pprof.go
+++ b/cmd/ctr/pprof.go
@@ -49,10 +49,8 @@ var pprofGoroutinesCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
@@ -67,10 +65,8 @@ var pprofHeapCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
@@ -85,10 +81,8 @@ var pprofProfileCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
@@ -112,11 +106,8 @@ var pprofTraceCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
-
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
@@ -131,10 +122,8 @@ var pprofBlockCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
@@ -149,10 +138,8 @@ var pprofThreadcreateCommand = cli.Command{
 			return err
 		}
 		defer output.Close()
-		if _, err := io.Copy(os.Stdout, output); err != nil {
-			return err
-		}
-		return nil
+		_, err = io.Copy(os.Stdout, output)
+		return err
 	},
 }
 
diff --git a/cmd/dist/fetchobject.go b/cmd/dist/fetchobject.go
index c4d5048..ca90a8f 100644
--- a/cmd/dist/fetchobject.go
+++ b/cmd/dist/fetchobject.go
@@ -58,10 +58,7 @@ var fetchObjectCommand = cli.Command{
 		}
 		defer rc.Close()
 
-		if _, err := io.Copy(os.Stdout, rc); err != nil {
-			return err
-		}
-
-		return nil
+		_, err = io.Copy(os.Stdout, rc)
+		return err
 	},
 }
diff --git a/fs/fstest/file.go b/fs/fstest/file.go
index 7af6edf..41c1047 100644
--- a/fs/fstest/file.go
+++ b/fs/fstest/file.go
@@ -57,10 +57,7 @@ func RemoveAll(name string) Applier {
 func CreateDir(name string, perm os.FileMode) Applier {
 	return applyFn(func(root string) error {
 		fullPath := filepath.Join(root, name)
-		if err := os.MkdirAll(fullPath, perm); err != nil {
-			return err
-		}
-		return nil
+		return os.MkdirAll(fullPath, perm)
 	})
 }