From cfc36388b3ed897a04fa39ff712c3958651237e3 Mon Sep 17 00:00:00 2001
From: Davor Kapsa <davor.kapsa@gmail.com>
Date: Tue, 30 Apr 2019 21:28:51 +0200
Subject: [PATCH] Remove redundant error checks

Signed-off-by: Davor Kapsa <davor.kapsa@gmail.com>
---
 cmd/ctr/commands/containers/containers.go | 6 +-----
 images/archive/importer.go                | 5 +----
 metadata/content.go                       | 6 +-----
 services/server/server.go                 | 6 ++----
 snapshots/devmapper/metadata.go           | 6 +-----
 5 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go
index 9110d7d48..91f164c1a 100644
--- a/cmd/ctr/commands/containers/containers.go
+++ b/cmd/ctr/commands/containers/containers.go
@@ -427,10 +427,6 @@ var restoreCommand = cli.Command{
 			return err
 		}
 
-		if err := task.Start(ctx); err != nil {
-			return err
-		}
-
-		return nil
+		return task.Start(ctx)
 	},
 }
diff --git a/images/archive/importer.go b/images/archive/importer.go
index da83275c3..692c76b1f 100644
--- a/images/archive/importer.go
+++ b/images/archive/importer.go
@@ -197,10 +197,7 @@ func onUntarJSON(r io.Reader, j interface{}) error {
 	if err != nil {
 		return err
 	}
-	if err := json.Unmarshal(b, j); err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal(b, j)
 }
 
 func onUntarBlob(ctx context.Context, r io.Reader, store content.Ingester, size int64, ref string) (digest.Digest, error) {
diff --git a/metadata/content.go b/metadata/content.go
index 4d244914d..00f310f7b 100644
--- a/metadata/content.go
+++ b/metadata/content.go
@@ -767,11 +767,7 @@ func writeExpireAt(expire time.Time, bkt *bolt.Bucket) error {
 	if err != nil {
 		return err
 	}
-	if err := bkt.Put(bucketKeyExpireAt, expireAt); err != nil {
-		return err
-	}
-
-	return nil
+	return bkt.Put(bucketKeyExpireAt, expireAt)
 }
 
 func (cs *contentStore) garbageCollect(ctx context.Context) (d time.Duration, err error) {
diff --git a/services/server/server.go b/services/server/server.go
index ed4e8b9f5..bd76b4d68 100644
--- a/services/server/server.go
+++ b/services/server/server.go
@@ -67,10 +67,8 @@ func CreateTopLevelDirectories(config *srvconfig.Config) error {
 	if err := sys.MkdirAllWithACL(config.Root, 0711); err != nil {
 		return err
 	}
-	if err := sys.MkdirAllWithACL(config.State, 0711); err != nil {
-		return err
-	}
-	return nil
+
+	return sys.MkdirAllWithACL(config.State, 0711)
 }
 
 // New creates and initializes a new containerd server
diff --git a/snapshots/devmapper/metadata.go b/snapshots/devmapper/metadata.go
index e40430b9b..cc17efe1f 100644
--- a/snapshots/devmapper/metadata.go
+++ b/snapshots/devmapper/metadata.go
@@ -241,11 +241,7 @@ func (m *PoolMetadata) RemoveDevice(ctx context.Context, name string) error {
 			return errors.Wrapf(err, "failed to delete device info for %q", name)
 		}
 
-		if err := markDeviceID(tx, device.DeviceID, deviceFree); err != nil {
-			return err
-		}
-
-		return nil
+		return markDeviceID(tx, device.DeviceID, deviceFree)
 	})
 }