vitalif
/
fusego
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only mark as unlinked in rmdir.

geesefs-0-30-9
Aaron Jacobs 2015-03-03 14:56:55 +11:00
parent 140bd18863
commit 651984dc1a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/memfs/fs.go
View File

@ -332,9 +332,8 @@ func (fs *memFS) RmDir(
// Remove the entry within the parent.
parent.RemoveChild(req.Name)
// TODO(jacobsa): Don't remove the child until it's forgotten. Can we get a
// failing test by continuing to read from an opened dir handle?
fs.deallocateInode(childID)
// Mark the child as unlinked.
child.linkCount--
return
}

14
samples/memfs/inode.go
View File

@ -31,6 +31,13 @@ type inode struct {
mu syncutil.InvariantMutex
// The number of times this inode is linked into a parent directory. This may
// be zero if the inode has been unlinked but not yet forgotten, because some
// process still has an open file handle.
//
// INVARIANT: linkCount >= 0
linkCount int // GUARDED_BY(mu)
// The current attributes of this inode.
//
// INVARIANT: No non-permission mode bits are set besides os.ModeDir
@ -64,8 +71,10 @@ type inode struct {
// Helpers
////////////////////////////////////////////////////////////////////////
// Initially the link count is one.
func newInode(attrs fuse.InodeAttributes) (in *inode) {
in = &inode{
linkCount: 1,
dir: (attrs.Mode&os.ModeDir != 0),
attributes: attrs,
}
@ -75,6 +84,11 @@ func newInode(attrs fuse.InodeAttributes) (in *inode) {
}
func (inode *inode) checkInvariants() {
// Check the link count.
if inode.linkCount < 0 {
panic(fmt.Sprintf("Negative link count: %v", inode.linkCount))
}
// No non-permission mode bits should be set besides os.ModeDir.
if inode.attributes.Mode & ^(os.ModePerm|os.ModeDir) != 0 {
panic(fmt.Sprintf("Unexpected mode: %v", inode.attributes.Mode))