go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fuse: don't call dentry.InsertChild 

It is called from the kernfs code (OpenAt and revalidateChildLocked()).

For RemoveChildLocked, it is opposed. We need to call it from fuse.RmDir and
fuse.Unlink.

PiperOrigin-RevId: 333453218
This commit is contained in:
Andrei Vagin 2020-09-23 23:32:46 -07:00 committed by gVisor bot
parent 03898a087d
commit 3838e83a98
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/sentry/fsimpl/fuse/fusefs.go
View File

@ -528,12 +528,7 @@ func (i *inode) RmDir(ctx context.Context, name string, child *vfs.Dentry) error
return err
}
// TODO(Before merging): When creating new nodes, should we add nodes to the ordered children?
// If so we'll probably need to call this. We will also need to add them with the writable flag when
// appropriate.
// return i.OrderedChildren.RmDir(ctx, name, child)
return nil
return i.dentry.RemoveChildLocked(name, child)
}
// newEntry calls FUSE server for entry creation and allocates corresponding entry according to response.
@ -563,11 +558,6 @@ func (i *inode) newEntry(ctx context.Context, name string, fileType linux.FileMo
return nil, syserror.EIO
}
child := i.fs.newInode(out.NodeID, out.Attr)
if opcode == linux.FUSE_LOOKUP {
i.dentry.InsertChildLocked(name, child)
} else {
i.dentry.InsertChild(name, child)
}
return child, nil
}