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

Fixed some hellofs build errors.

geesefs-0-30-9
Aaron Jacobs 2015-03-24 15:39:45 +11:00
parent d84d821a32
commit 402cc580b2
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
samples/hellofs/hello_fs.go
View File

@ -19,9 +19,10 @@ import (
"os" "os"
"strings" "strings"
"github.com/jacobsa/fuse"
"github.com/jacobsa/fuse/fuseutil"
"github.com/googlecloudplatform/gcsfuse/timeutil" "github.com/googlecloudplatform/gcsfuse/timeutil"
"github.com/jacobsa/fuse"
"github.com/jacobsa/fuse/fuseops"
"github.com/jacobsa/fuse/fuseutil"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
@ -33,21 +34,18 @@ import (
// //
// Each file contains the string "Hello, world!". // Each file contains the string "Hello, world!".
type HelloFS struct { type HelloFS struct {
fuseutil.NotImplementedFileSystem
Clock timeutil.Clock Clock timeutil.Clock
} }
var _ fuse.FileSystem = &HelloFS{}
const ( const (
rootInode fuse.InodeID = fuse.RootInodeID + iota rootInode fuseops.InodeID = fuseops.RootInodeID + iota
helloInode helloInode
dirInode dirInode
worldInode worldInode
) )
type inodeInfo struct { type inodeInfo struct {
attributes fuse.InodeAttributes attributes fuseops.InodeAttributes
// File or directory? // File or directory?
dir bool dir bool
@ -57,10 +55,10 @@ type inodeInfo struct {
} }
// We have a fixed directory structure. // We have a fixed directory structure.
var gInodeInfo = map[fuse.InodeID]inodeInfo{ var gInodeInfo = map[fuseops.InodeID]inodeInfo{
// root // root
rootInode: inodeInfo{ rootInode: inodeInfo{
attributes: fuse.InodeAttributes{ attributes: fuseops.InodeAttributes{
Nlink: 1, Nlink: 1,
Mode: 0555 | os.ModeDir, Mode: 0555 | os.ModeDir,
}, },
@ -83,7 +81,7 @@ var gInodeInfo = map[fuse.InodeID]inodeInfo{
// hello // hello
helloInode: inodeInfo{ helloInode: inodeInfo{
attributes: fuse.InodeAttributes{ attributes: fuseops.InodeAttributes{
Nlink: 1, Nlink: 1,
Mode: 0444, Mode: 0444,
Size: uint64(len("Hello, world!")), Size: uint64(len("Hello, world!")),
@ -92,7 +90,7 @@ var gInodeInfo = map[fuse.InodeID]inodeInfo{
// dir // dir
dirInode: inodeInfo{ dirInode: inodeInfo{
attributes: fuse.InodeAttributes{ attributes: fuseops.InodeAttributes{
Nlink: 1, Nlink: 1,
Mode: 0555 | os.ModeDir, Mode: 0555 | os.ModeDir,
}, },
@ -109,7 +107,7 @@ var gInodeInfo = map[fuse.InodeID]inodeInfo{
// world // world
worldInode: inodeInfo{ worldInode: inodeInfo{
attributes: fuse.InodeAttributes{ attributes: fuseops.InodeAttributes{
Nlink: 1, Nlink: 1,
Mode: 0444, Mode: 0444,
Size: uint64(len("Hello, world!")), Size: uint64(len("Hello, world!")),
@ -119,7 +117,7 @@ var gInodeInfo = map[fuse.InodeID]inodeInfo{
func findChildInode( func findChildInode(
name string, name string,
children []fuseutil.Dirent) (inode fuse.InodeID, err error) { children []fuseutil.Dirent) (inode fuseops.InodeID, err error) {
for _, e := range children { for _, e := range children {
if e.Name == name { if e.Name == name {
inode = e.Inode inode = e.Inode
@ -132,7 +130,7 @@ func findChildInode(
} }
func (fs *HelloFS) patchAttributes( func (fs *HelloFS) patchAttributes(
attr *fuse.InodeAttributes) { attr *fuseops.InodeAttributes) {
now := fs.Clock.Now() now := fs.Clock.Now()
attr.Atime = now attr.Atime = now
attr.Mtime = now attr.Mtime = now