Skip to content

Commit

Permalink
Merge pull request #1381 from mtrmac/shutdown-touch
Browse files Browse the repository at this point in the history
Remove a manual layerStore.Touch() call from store.Shutdown()
  • Loading branch information
rhatdan committed Oct 14, 2022
2 parents 910667d + 0b5faf9 commit ebf857f
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions store.go
Expand Up @@ -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 {
Expand Down Expand Up @@ -3288,7 +3287,6 @@ func (s *store) Shutdown(force bool) ([]string, error) {
}
break
}
modified = true
}
}
}
Expand All @@ -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
}
Expand Down

0 comments on commit ebf857f

Please sign in to comment.