Merge pull request #8504 from dcantah/close-f-early

Simplify closing bundle dir fd
2023-05-10 10:09:01 +08:00
parent b0f587d65d df65e321ee
commit bd185813ac
1 changed files with 1 additions and 2 deletions
--- a/runtime/v2/shim_load.go
+++ b/runtime/v2/shim_load.go
@@ -91,13 +91,12 @@ func (m *ShimManager) loadShims(ctx context.Context) error {
 		}

 		bf, err := f.Readdirnames(-1)
+		f.Close()
 		if err != nil {
-			f.Close()
 			bundle.Delete()
 			log.G(ctx).WithError(err).Errorf("fast path read bundle path for %s", bundle.Path)
 			continue
 		}
-		f.Close()
 		if len(bf) == 0 {
 			bundle.Delete()
 			continue