github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Simplify closing bundle dir fd
This commit is contained in:
Fu Wei
2023-05-10 10:09:01 +08:00
committed by GitHub
parent b0f587d65d df65e321ee
commit bd185813ac
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/v2/shim_load.go
View File

@@ -91,13 +91,12 @@ func (m *ShimManager) loadShims(ctx context.Context) error {
} }
bf, err := f.Readdirnames(-1) bf, err := f.Readdirnames(-1)
f.Close()
if err != nil { if err != nil {
f.Close()
bundle.Delete() bundle.Delete()
log.G(ctx).WithError(err).Errorf("fast path read bundle path for %s", bundle.Path) log.G(ctx).WithError(err).Errorf("fast path read bundle path for %s", bundle.Path)
continue continue
} }
f.Close()
if len(bf) == 0 { if len(bf) == 0 {
bundle.Delete() bundle.Delete()
continue continue