store: remove redundant code

EnsureRemoveAll already implements the trivial rm -rf attempt first, so there is no need to try it before calling EnsureRemoveAll. Signed-off-by: Giuseppe Scrivano <[email protected]>
kimminss0 · Sep 27, 2023 · c985295 · c985295
1 parent 70f801f
commit c985295
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/store.go b/store.go
@@ -2672,21 +2672,11 @@ func (s *store) DeleteContainer(id string) error {
 
 		wg.Go(func() error {
 			gcpath := filepath.Join(s.GraphRoot(), middleDir, container.ID)
-			// attempt a simple rm -rf first
-			if err := os.RemoveAll(gcpath); err == nil {
-				return nil
-			}
-			// and if it fails get to the more complicated cleanup
 			return system.EnsureRemoveAll(gcpath)
 		})
 
 		wg.Go(func() error {
 			rcpath := filepath.Join(s.RunRoot(), middleDir, container.ID)
-			// attempt a simple rm -rf first
-			if err := os.RemoveAll(rcpath); err == nil {
-				return nil
-			}
-			// and if it fails get to the more complicated cleanup
 			return system.EnsureRemoveAll(rcpath)
 		})