From 378154d5a387863e601713eaa9dadc66d46a5bf3 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Mon, 18 May 2015 10:48:12 +0900 Subject: [PATCH] Fixing terrible bug where directories and files were interchanged --- dir.go | 4 ++-- vfs.go | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dir.go b/dir.go index c3acb1e..ad659de 100644 --- a/dir.go +++ b/dir.go @@ -63,12 +63,12 @@ func (this versionedDir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) } for name, dir := range this.dirs { - entry := fuse.Dirent{Inode: dir.inode, Name: name, Type: fuse.DT_File} + entry := fuse.Dirent{Inode: dir.inode, Name: name, Type: fuse.DT_Dir} entries = append(entries, entry) } for name, file := range this.files { - entry := fuse.Dirent{Inode: file.inode, Name: name, Type: fuse.DT_Dir} + entry := fuse.Dirent{Inode: file.inode, Name: name, Type: fuse.DT_File} entries = append(entries, entry) } diff --git a/vfs.go b/vfs.go index 35eb6d2..bbfd5f8 100644 --- a/vfs.go +++ b/vfs.go @@ -34,13 +34,7 @@ func main() { log.Fatal(err) } - c, err := fuse.Mount( - "mp", - fuse.FSName("vfs"), - fuse.Subtype("vfs"), - fuse.LocalVolume(), - fuse.VolumeName("vfs"), - ) + c, err := fuse.Mount("mp") if err != nil { log.Fatal(err) }