Merge pull request #2328 from mtrmac/DifferOutput-nits

Fix nits from #2312

Author: openshift-merge-bot[bot]

layers.go

@@ -2550,7 +2550,7 @@ func (r *layerStore) applyDiffFromStagingDirectory(id string, diffOutput *driver
 		if err != nil {
 			compressor = pgzip.NewWriter(&tsdata)
 		}
-		if _, err := diffOutput.TarSplit.Seek(0, 0); err != nil {
+		if _, err := diffOutput.TarSplit.Seek(0, io.SeekStart); err != nil {
 			return err
 		}
 

pkg/archive/archive.go

@@ -1490,7 +1490,7 @@ func NewTempArchive(src io.Reader, dir string) (*TempArchive, error) {
 	if _, err := io.Copy(f, src); err != nil {
 		return nil, err
 	}
-	if _, err := f.Seek(0, 0); err != nil {
+	if _, err := f.Seek(0, io.SeekStart); err != nil {
 		return nil, err
 	}
 	st, err := f.Stat()

pkg/chunked/compression_linux.go

@@ -182,8 +182,8 @@ func openTmpFileNoTmpFile(tmpDir string) (*os.File, error) {
 // readZstdChunkedManifest reads the zstd:chunked manifest from the seekable stream blobStream.
 // tmpDir is a directory where the tar-split temporary file is written to.  The file is opened with
 // O_TMPFILE so that it is automatically removed when it is closed.
-// Returns (manifest blob, parsed manifest, tar-split file or nil, manifest offset).  The opened tar-split file
-// points to the end of the file (equivalent to Seek(0, 2)).
+// Returns (manifest blob, parsed manifest, tar-split file or nil, manifest offset).
+// The opened tar-split file’s position is unspecified.
 // It may return an error matching ErrFallbackToOrdinaryLayerDownload / errFallbackCanConvert.
 func readZstdChunkedManifest(tmpDir string, blobStream ImageSourceSeekable, tocDigest digest.Digest, annotations map[string]string) (_ []byte, _ *minimal.TOC, _ *os.File, _ int64, retErr error) {
 	offsetMetadata := annotations[minimal.ManifestInfoKey]
@@ -323,7 +323,7 @@ func ensureTOCMatchesTarSplit(toc *minimal.TOC, tarSplit *os.File) error {
 		}
 	}
 
-	if _, err := tarSplit.Seek(0, 0); err != nil {
+	if _, err := tarSplit.Seek(0, io.SeekStart); err != nil {
 		return err
 	}
 
@@ -507,7 +507,7 @@ func decodeAndValidateBlobToStream(blob []byte, w *os.File, expectedCompressedCh
 		return err
 	}
 
-	decoder, err := zstd.NewReader(bytes.NewReader(blob)) //nolint:contextcheck
+	decoder, err := zstd.NewReader(bytes.NewReader(blob))
 	if err != nil {
 		return err
 	}

pkg/chunked/storage_linux.go

@@ -353,7 +353,7 @@ func makeZstdChunkedDiffer(store storage.Store, blobSize int64, tocDigest digest
 
 	var uncompressedTarSize int64 = -1
 	if tarSplit != nil {
-		if _, err := tarSplit.Seek(0, 0); err != nil {
+		if _, err := tarSplit.Seek(0, io.SeekStart); err != nil {
 			return nil, err
 		}
 		uncompressedTarSize, err = tarSizeFromTarSplit(tarSplit)
@@ -659,7 +659,7 @@ func (o *originFile) OpenFile() (io.ReadCloser, error) {
 		return nil, err
 	}
 
-	if _, err := srcFile.Seek(o.Offset, 0); err != nil {
+	if _, err := srcFile.Seek(o.Offset, io.SeekStart); err != nil {
 		srcFile.Close()
 		return nil, err
 	}
@@ -1863,7 +1863,7 @@ func (c *chunkedDiffer) ApplyDiff(dest string, options *archive.TarOptions, diff
 		case c.pullOptions.insecureAllowUnpredictableImageContents:
 			// Oh well.  Skip the costly digest computation.
 		case output.TarSplit != nil:
-			if _, err := output.TarSplit.Seek(0, 0); err != nil {
+			if _, err := output.TarSplit.Seek(0, io.SeekStart); err != nil {
 				return output, err
 			}
 			metadata := tsStorage.NewJSONUnpacker(output.TarSplit)
@@ -1989,7 +1989,7 @@ func validateChunkChecksum(chunk *minimal.FileMetadata, root, path string, offse
 	}
 	defer fd.Close()
 
-	if _, err := unix.Seek(int(fd.Fd()), offset, 0); err != nil {
+	if _, err := fd.Seek(offset, io.SeekStart); err != nil {
 		return false
 	}