Golint: remove redundant ifs

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

3 files changed, 3 insertions, 14 deletions

diff --git a/layer/layer_test.go b/layer/layer_test.go
index f632d44b90..f682035ce1 100644
--- a/layer/layer_test.go
+++ b/layer/layer_test.go
@@ -153,10 +153,7 @@ func (tf *testFile) ApplyFile(root containerfs.ContainerFS) error {
 			return err
 		}
 	}
-	if err := driver.WriteFile(root, fullPath, tf.content, tf.permission); err != nil {
-		return err
-	}
-	return nil
+	return driver.WriteFile(root, fullPath, tf.content, tf.permission)
 }
 
 func initWithFiles(files ...FileApplier) layerInit {
diff --git a/layer/migration.go b/layer/migration.go
index f4c4adec4a..9c0c2c94ed 100644
--- a/layer/migration.go
+++ b/layer/migration.go
@@ -68,11 +68,7 @@ func (ls *layerStore) CreateRWLayerByGraphID(name string, graphID string, parent
 		m.initID = initID
 	}
 
-	if err = ls.saveMount(m); err != nil {
-		return err
-	}
-
-	return nil
+	return ls.saveMount(m)
 }
 
 func (ls *layerStore) ChecksumForGraphID(id, parent, oldTarDataPath, newTarDataPath string) (diffID DiffID, size int64, err error) {
diff --git a/layer/ro_layer.go b/layer/ro_layer.go
index f634194b89..ca3e1189f3 100644
--- a/layer/ro_layer.go
+++ b/layer/ro_layer.go
@@ -143,11 +143,7 @@ func storeLayer(tx MetadataTransaction, layer *roLayer) error {
 			return err
 		}
 	}
-	if err := tx.SetOS(layer.os); err != nil {
-		return err
-	}
-
-	return nil
+	return tx.SetOS(layer.os)
 }
 
 func newVerifiedReadCloser(rc io.ReadCloser, dgst digest.Digest) (io.ReadCloser, error) {