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

Simplify closing bundle dir fd

Browse Source 
Follow-up to #8489. We don't need to call Close in the err and success
cases, we can just do it after Readdirnames returns.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2023-05-09 17:22:04 -07:00
parent a28606ec1b
commit df65e321ee
1 changed files with 1 additions and 2 deletions
Show Stats 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