alex/vfs
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2015-06-16 17:05:29 +09:00
parent a668eb47ac
commit 0506c89aa9
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dir.go
View File

@ -26,7 +26,6 @@ import (
"bazil.org/fuse" "bazil.org/fuse"
"bazil.org/fuse/fs" "bazil.org/fuse/fs"
"golang.org/x/net/context" "golang.org/x/net/context"
"log"
"os" "os"
"path" "path"
) )
@ -56,7 +55,6 @@ func newVersionedDir(node *versionedNode, parent *versionedDir) *versionedDir {
func (this *versionedDir) version() error { func (this *versionedDir) version() error {
if this.dirty { if this.dirty {
log.Printf("not dirty")
return nil return nil
} }
@ -64,20 +62,17 @@ func (this *versionedDir) version() error {
rebasedPath := version.rebasePath(this.node.path) rebasedPath := version.rebasePath(this.node.path)
if err := os.MkdirAll(rebasedPath, 0755); err != nil { if err := os.MkdirAll(rebasedPath, 0755); err != nil {
log.Printf("cannot create directory %s", rebasedPath)
return err return err
} }
node, err := newVersionedNode(this.node.path, version, this.node) node, err := newVersionedNode(this.node.path, version, this.node)
if err != nil { if err != nil {
log.Printf("cannot create versioned node for %s", rebasedPath)
return err return err
} }
this.node = node this.node = node
this.dirty = true this.dirty = true
log.Printf("created directory for %s, %s", version.base, rebasedPath)
return nil return nil
} }
@ -126,7 +121,7 @@ func (this *versionedDir) Attr(ctx context.Context, attr *fuse.Attr) error {
} }
func (this *versionedDir) Getattr(ctx context.Context, req *fuse.GetattrRequest, resp *fuse.GetattrResponse) error { func (this *versionedDir) Getattr(ctx context.Context, req *fuse.GetattrRequest, resp *fuse.GetattrResponse) error {
if err := this.node.updateInfo(); err != nil { if err := this.node.sync(); err != nil {
return err return err
} }
@ -160,6 +155,14 @@ func (this *versionedDir) Create(ctx context.Context, req *fuse.CreateRequest, r
} }
} }
func (this *versionedDir) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fs.Node, error) {
if err := this.version(); err != nil {
return nil, err
}
return this.createDir(req.Name)
}
func (this *versionedDir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { func (this *versionedDir) Remove(ctx context.Context, req *fuse.RemoveRequest) error {
var fullPath string var fullPath string
if req.Dir { if req.Dir {
@ -173,10 +176,6 @@ func (this *versionedDir) Remove(ctx context.Context, req *fuse.RemoveRequest) e
return os.Remove(fullPath) return os.Remove(fullPath)
} }
func (this *versionedDir) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fs.Node, error) {
return this.createDir(req.Name)
}
func (this *versionedDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { func (this *versionedDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
entries := []fuse.Dirent{{Inode: this.inode, Name: ".", Type: fuse.DT_Dir}} entries := []fuse.Dirent{{Inode: this.inode, Name: ".", Type: fuse.DT_Dir}}
if this.parent != nil { if this.parent != nil {

2
file.go
View File

@ -69,7 +69,7 @@ func (this *versionedFile) Attr(ctx context.Context, attr *fuse.Attr) error {
} }
func (this *versionedFile) Getattr(ctx context.Context, req *fuse.GetattrRequest, resp *fuse.GetattrResponse) error { func (this *versionedFile) Getattr(ctx context.Context, req *fuse.GetattrRequest, resp *fuse.GetattrResponse) error {
if err := this.node.updateInfo(); err != nil { if err := this.node.sync(); err != nil {
return err return err
} }

4
node.go
View File

@ -90,7 +90,7 @@ func (this *versionedNode) setAttr(req *fuse.SetattrRequest, resp *fuse.SetattrR
} }
} }
if err := this.updateInfo(); err != nil { if err := this.sync(); err != nil {
return err return err
} }
@ -98,7 +98,7 @@ func (this *versionedNode) setAttr(req *fuse.SetattrRequest, resp *fuse.SetattrR
return nil return nil
} }
func (this *versionedNode) updateInfo() error { func (this *versionedNode) sync() error {
info, err := os.Stat(this.rebasedPath()) info, err := os.Stat(this.rebasedPath())
if err != nil { if err != nil {
return err return err