@@ -26,19 +26,20 @@ f, err := os.Open(filename)
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not open file for reading")
 	}
+	defer f.Close()
 	stat, err := f.Stat()
 	if err != nil {
 		return nil, errors.WithMessage(err, "could not stat file")
-	}
-
-	etag, err := etag(f)
-	if err != nil {
-		return nil, errors.WithMessage(err, "could not calculate etag")
 	}
 
 	buf := new(buffer.Buffer)
 	if _, err := f.WriteTo(buf); err != nil {
 		return nil, errors.WithMessage(err, "could not read file")
+	}
+
+	etag, err := etag(buf)
+	if err != nil {
+		return nil, errors.WithMessage(err, "could not calculate etag")
 	}
 
 	file := &storage.File{