opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-11 01:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update containers/storage to v1.15.4

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2019-12-23 10:14:48 -05:00
parent fcd48db4d2
commit 6dfffa92d9
7 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/containers/storage/store.go generated vendored
View File

@@ -2479,6 +2479,10 @@ func (s *store) Mount(id, mountLabel string) (string, error) {
if err != nil {
return "", err
}
s.graphLock.Lock()
defer s.graphLock.Unlock()
rlstore.Lock()
defer rlstore.Unlock()
if modified, err := rlstore.Modified(); modified || err != nil {
@@ -2486,6 +2490,18 @@ func (s *store) Mount(id, mountLabel string) (string, error) {
return "", err
}
}
/* We need to make sure the home mount is present when the Mount is done. */
if s.graphLock.TouchedSince(s.lastLoaded) {
s.graphDriver = nil
s.layerStore = nil
s.graphDriver, err = s.getGraphDriver()
if err != nil {
return "", err
}
s.lastLoaded = time.Now()
}
if rlstore.Exists(id) {
options := drivers.MountOpts{
MountLabel: mountLabel,