beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use unlocked version of changes for GetImage

Browse source 
Fixes #7999

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
This commit is contained in:
Alexandr Morozov 2014-09-12 11:44:25 +04:00
parent 555ce0cb54
commit 82bdd88e9c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/container.go
View file

@ -686,10 +686,14 @@ func (container *Container) Mount() error {
return container.daemon.Mount(container) return container.daemon.Mount(container)
} }
func (container *Container) changes() ([]archive.Change, error) {
return container.daemon.Changes(container)
}
func (container *Container) Changes() ([]archive.Change, error) { func (container *Container) Changes() ([]archive.Change, error) {
container.Lock() container.Lock()
defer container.Unlock() defer container.Unlock()
return container.daemon.Changes(container) return container.changes()
} }
func (container *Container) GetImage() (*image.Image, error) { func (container *Container) GetImage() (*image.Image, error) {
@ -759,7 +763,7 @@ func (container *Container) GetSize() (int64, int64) {
sizeRw = -1 sizeRw = -1
} }
} else { } else {
changes, _ := container.Changes() changes, _ := container.changes()
if changes != nil { if changes != nil {
sizeRw = archive.ChangesSize(container.basefs, changes) sizeRw = archive.ChangesSize(container.basefs, changes)
} else { } else {