gofer: don't leak file descriptors

Fixes #219

PiperOrigin-RevId: 246568639
Change-Id: Ic7afd15dde922638d77f6429c508d1cbe2e4288a
This commit is contained in:
Andrei Vagin 2019-05-03 14:00:31 -07:00 committed by Shentubot
parent f2699b76c8
commit 24d8656585
3 changed files with 9 additions and 1 deletions

View File

@ -139,11 +139,12 @@ func (cp cachePolicy) revalidate(ctx context.Context, name string, parent, child
// TODO(b/112031682): If we have a directory FD in the parent
// inodeOperations, then we can use fstatat(2) to get the inode
// attributes instead of making this RPC.
qids, _, mask, attr, err := parentIops.fileState.file.walkGetAttr(ctx, []string{name})
qids, f, mask, attr, err := parentIops.fileState.file.walkGetAttr(ctx, []string{name})
if err != nil {
// Can't look up the name. Trigger reload.
return true
}
f.close(ctx)
// If the Path has changed, then we are not looking at the file file.
// We must reload.

View File

@ -109,6 +109,7 @@ func (i *inodeOperations) Create(ctx context.Context, dir *fs.Inode, name string
hostFile, err := newFile.create(ctx, name, openFlags, p9.FileMode(perm.LinuxMode()), p9.UID(owner.UID), p9.GID(owner.GID))
if err != nil {
// Could not create the file.
newFile.close(ctx)
return nil, err
}
@ -120,11 +121,14 @@ func (i *inodeOperations) Create(ctx context.Context, dir *fs.Inode, name string
qids, unopened, mask, p9attr, err := i.fileState.file.walkGetAttr(ctx, []string{name})
if err != nil {
newFile.close(ctx)
hostFile.Close()
return nil, err
}
if len(qids) != 1 {
log.Warningf("WalkGetAttr(%s) succeeded, but returned %d QIDs (%v), wanted 1", name, len(qids), qids)
newFile.close(ctx)
hostFile.Close()
unopened.close(ctx)
return nil, syserror.EIO
}
qid := qids[0]

View File

@ -502,6 +502,9 @@ func (l *localFile) Walk(names []string) ([]p9.QID, p9.File, error) {
last := l
for _, name := range names {
f, path, err := openAnyFileFromParent(last, name)
if last != l {
last.Close()
}
if err != nil {
return nil, nil, extractErrno(err)
}