Renamed package fuseutil -> fuse.
parent
915afb6308
commit
90ef75da6f
6
debug.go
6
debug.go
|
@ -1,7 +1,7 @@
|
||||||
// Copyright 2015 Google Inc. All Rights Reserved.
|
// Copyright 2015 Google Inc. All Rights Reserved.
|
||||||
// Author: jacobsa@google.com (Aaron Jacobs)
|
// Author: jacobsa@google.com (Aaron Jacobs)
|
||||||
|
|
||||||
package fuseutil
|
package fuse
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
|
@ -12,7 +12,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var fEnableDebug = flag.Bool(
|
var fEnableDebug = flag.Bool(
|
||||||
"fuseutil.debug",
|
"fuse.debug",
|
||||||
false,
|
false,
|
||||||
"Write FUSE debugging messages to stderr.")
|
"Write FUSE debugging messages to stderr.")
|
||||||
|
|
||||||
|
@ -23,5 +23,5 @@ func getLogger() *log.Logger {
|
||||||
writer = os.Stderr
|
writer = os.Stderr
|
||||||
}
|
}
|
||||||
|
|
||||||
return log.New(writer, "fuseutil: ", log.LstdFlags)
|
return log.New(writer, "fuse: ", log.LstdFlags)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Copyright 2015 Google Inc. All Rights Reserved.
|
// Copyright 2015 Google Inc. All Rights Reserved.
|
||||||
// Author: jacobsa@google.com (Aaron Jacobs)
|
// Author: jacobsa@google.com (Aaron Jacobs)
|
||||||
|
|
||||||
package fuseutil
|
package fuse
|
||||||
|
|
||||||
import "bazil.org/fuse"
|
import "bazil.org/fuse"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Copyright 2015 Google Inc. All Rights Reserved.
|
// Copyright 2015 Google Inc. All Rights Reserved.
|
||||||
// Author: jacobsa@google.com (Aaron Jacobs)
|
// Author: jacobsa@google.com (Aaron Jacobs)
|
||||||
|
|
||||||
package fuseutil
|
package fuse
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Copyright 2015 Google Inc. All Rights Reserved.
|
// Copyright 2015 Google Inc. All Rights Reserved.
|
||||||
// Author: jacobsa@google.com (Aaron Jacobs)
|
// Author: jacobsa@google.com (Aaron Jacobs)
|
||||||
|
|
||||||
package fuseutil
|
package fuse
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// Copyright 2015 Google Inc. All Rights Reserved.
|
// Copyright 2015 Google Inc. All Rights Reserved.
|
||||||
// Author: jacobsa@google.com (Aaron Jacobs)
|
// Author: jacobsa@google.com (Aaron Jacobs)
|
||||||
|
|
||||||
package fuseutil
|
package fuse
|
||||||
|
|
||||||
import "golang.org/x/net/context"
|
import "golang.org/x/net/context"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
package samples
|
package samples
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/jacobsa/gcsfuse/fuseutil"
|
"github.com/jacobsa/fuse"
|
||||||
"github.com/jacobsa/gcsfuse/timeutil"
|
"github.com/jacobsa/gcsfuse/timeutil"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
@ -17,21 +17,21 @@ import (
|
||||||
//
|
//
|
||||||
// Each file contains the string "Hello, world!".
|
// Each file contains the string "Hello, world!".
|
||||||
type HelloFS struct {
|
type HelloFS struct {
|
||||||
fuseutil.NotImplementedFileSystem
|
fuse.NotImplementedFileSystem
|
||||||
Clock timeutil.Clock
|
Clock timeutil.Clock
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ fuseutil.FileSystem = &HelloFS{}
|
var _ fuse.FileSystem = &HelloFS{}
|
||||||
|
|
||||||
func (fs *HelloFS) Open(
|
func (fs *HelloFS) Open(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
req *fuseutil.OpenRequest) (resp *fuseutil.OpenResponse, err error) {
|
req *fuse.OpenRequest) (resp *fuse.OpenResponse, err error) {
|
||||||
// We always allow opening the root directory.
|
// We always allow opening the root directory.
|
||||||
if req.Inode == fuseutil.RootInodeID {
|
if req.Inode == fuse.RootInodeID {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(jacobsa): Handle others.
|
// TODO(jacobsa): Handle others.
|
||||||
err = fuseutil.ENOSYS
|
err = fuse.ENOSYS
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,8 +11,8 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/jacobsa/gcsfuse/fuseutil"
|
"github.com/jacobsa/fuse"
|
||||||
"github.com/jacobsa/gcsfuse/fuseutil/samples"
|
"github.com/jacobsa/fuse/samples"
|
||||||
"github.com/jacobsa/gcsfuse/timeutil"
|
"github.com/jacobsa/gcsfuse/timeutil"
|
||||||
. "github.com/jacobsa/ogletest"
|
. "github.com/jacobsa/ogletest"
|
||||||
"golang.org/x/net/context"
|
"golang.org/x/net/context"
|
||||||
|
@ -26,7 +26,7 @@ func TestHelloFS(t *testing.T) { RunTests(t) }
|
||||||
|
|
||||||
type HelloFSTest struct {
|
type HelloFSTest struct {
|
||||||
clock timeutil.SimulatedClock
|
clock timeutil.SimulatedClock
|
||||||
mfs *fuseutil.MountedFileSystem
|
mfs *fuse.MountedFileSystem
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ SetUpInterface = &HelloFSTest{}
|
var _ SetUpInterface = &HelloFSTest{}
|
||||||
|
@ -51,7 +51,7 @@ func (t *HelloFSTest) SetUp(ti *TestInfo) {
|
||||||
Clock: &t.clock,
|
Clock: &t.clock,
|
||||||
}
|
}
|
||||||
|
|
||||||
if t.mfs, err = fuseutil.Mount(mountPoint, fs); err != nil {
|
if t.mfs, err = fuse.Mount(mountPoint, fs); err != nil {
|
||||||
panic("Mount: " + err.Error())
|
panic("Mount: " + err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue