containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1381 from mtrmac/shutdown-touch 

Remove a manual layerStore.Touch() call from store.Shutdown()
This commit is contained in:
Daniel J Walsh 2022-10-14 13:45:44 -04:00 committed by GitHub
parent 910667dfca 0b5faf994f
commit ebf857fda6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
store.go
View File

@ -3254,7 +3254,6 @@ func (s *store) FromContainerRunDirectory(id, file string) ([]byte, error) {
func (s *store) Shutdown(force bool) ([]string, error) {
mounted := []string{}
modified := false
rlstore, err := s.getLayerStore()
if err != nil {
@ -3288,7 +3287,6 @@ func (s *store) Shutdown(force bool) ([]string, error) {
}
break
}
modified = true
}
}
}
@ -3304,16 +3302,6 @@ func (s *store) Shutdown(force bool) ([]string, error) {
err = fmt.Errorf("(graphLock.Touch failed: %v) %w", err2, err)
}
}
modified = true
}
if modified {
if err2 := rlstore.Touch(); err2 != nil {
if err == nil {
err = err2
} else {
err = fmt.Errorf("rlstore.Touch failed: %v) %w", err2, err)
}
}
}
return mounted, err
}