kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

overlay2: call d.naiveDiff.ApplyDiff when useNaiveDiff==true 

Previously, `d.naiveDiff.ApplyDiff` was not used even when
`useNaiveDiff()==true`

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit dd97134232)
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2021-03-23 15:12:03 +09:00
parent cdd71c6736
commit daae27bfce
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/graphdriver/overlay2/overlay.go
View File

@ -678,7 +678,7 @@ func (d *Driver) isParent(id, parent string) bool {
// ApplyDiff applies the new layer into a root
func (d *Driver) ApplyDiff(id string, parent string, diff io.Reader) (size int64, err error) {
if !d.isParent(id, parent) {
if useNaiveDiff(d.home) || !d.isParent(id, parent) {
return d.naiveDiff.ApplyDiff(id, parent, diff)
}