Merge pull request #3256 from dvrkps/redundant

Remove redundant error checks

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)
 	},
 }

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) {

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) {

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

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)
 	})
 }