Merge pull request #19524 from LK4D4/iocopy_writeto

tiborvass · tiborvass · commit d2448a0c2015 · 2016-01-21T15:37:12.000-05:00
Use bufio.Reader in io.Copy source for overlay.copyRegular
diff --git a/daemon/graphdriver/overlay/copy.go b/daemon/graphdriver/overlay/copy.go
@@ -4,12 +4,12 @@ package overlay
 
 import (
 	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"syscall"
 	"time"
 
+	"github.com/docker/docker/pkg/pools"
 	"github.com/docker/docker/pkg/system"
 )
 
@@ -32,7 +32,7 @@ func copyRegular(srcPath, dstPath string, mode os.FileMode) error {
 	}
 	defer dstFile.Close()
 
-	_, err = io.Copy(dstFile, srcFile)
+	_, err = pools.Copy(dstFile, srcFile)
 
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ package overlay`
`4`	`4`
`5`	`5`	`import (`
`6`	`6`	`"fmt"`
`7`		`- "io"`
`8`	`7`	`"os"`
`9`	`8`	`"path/filepath"`
`10`	`9`	`"syscall"`
`11`	`10`	`"time"`
`12`	`11`
	`12`	`+ "github.com/docker/docker/pkg/pools"`
`13`	`13`	`"github.com/docker/docker/pkg/system"`
`14`	`14`	`)`
`15`	`15`
`@@ -32,7 +32,7 @@ func copyRegular(srcPath, dstPath string, mode os.FileMode) error {`
`32`	`32`	`}`
`33`	`33`	`defer dstFile.Close()`
`34`	`34`
`35`		`- _, err = io.Copy(dstFile, srcFile)`
	`35`	`+ _, err = pools.Copy(dstFile, srcFile)`
`36`	`36`
`37`	`37`	`return err`
`38`	`38`	`}`