From 90ef75da6f3128870f489f329f86a9bf08294a33 Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Fri, 27 Feb 2015 08:57:18 +1100
Subject: [PATCH] Renamed package fuseutil -> fuse.

---
 debug.go                       |  6 +++---
 errors.go                      |  2 +-
 file_system.go                 |  2 +-
 mounted_file_system.go         |  2 +-
 not_implemented_file_system.go |  2 +-
 samples/hello_fs.go            | 12 ++++++------
 samples/hello_fs_test.go       |  8 ++++----
 server.go                      |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debug.go b/debug.go
index 58fafdf..8171e16 100644
--- a/debug.go
+++ b/debug.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import (
 	"flag"
@@ -12,7 +12,7 @@ import (
 )
 
 var fEnableDebug = flag.Bool(
-	"fuseutil.debug",
+	"fuse.debug",
 	false,
 	"Write FUSE debugging messages to stderr.")
 
@@ -23,5 +23,5 @@ func getLogger() *log.Logger {
 		writer = os.Stderr
 	}
 
-	return log.New(writer, "fuseutil: ", log.LstdFlags)
+	return log.New(writer, "fuse: ", log.LstdFlags)
 }
diff --git a/errors.go b/errors.go
index dba5d04..1ac7a2b 100644
--- a/errors.go
+++ b/errors.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import "bazil.org/fuse"
 
diff --git a/file_system.go b/file_system.go
index a3c9422..acafb2e 100644
--- a/file_system.go
+++ b/file_system.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import (
 	"time"
diff --git a/mounted_file_system.go b/mounted_file_system.go
index 998952f..ab2ef8c 100644
--- a/mounted_file_system.go
+++ b/mounted_file_system.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import (
 	"errors"
diff --git a/not_implemented_file_system.go b/not_implemented_file_system.go
index b2eb8eb..5b9865a 100644
--- a/not_implemented_file_system.go
+++ b/not_implemented_file_system.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import "golang.org/x/net/context"
 
diff --git a/samples/hello_fs.go b/samples/hello_fs.go
index c604144..9b67d29 100644
--- a/samples/hello_fs.go
+++ b/samples/hello_fs.go
@@ -4,7 +4,7 @@
 package samples
 
 import (
-	"github.com/jacobsa/gcsfuse/fuseutil"
+	"github.com/jacobsa/fuse"
 	"github.com/jacobsa/gcsfuse/timeutil"
 	"golang.org/x/net/context"
 )
@@ -17,21 +17,21 @@ import (
 //
 // Each file contains the string "Hello, world!".
 type HelloFS struct {
-	fuseutil.NotImplementedFileSystem
+	fuse.NotImplementedFileSystem
 	Clock timeutil.Clock
 }
 
-var _ fuseutil.FileSystem = &HelloFS{}
+var _ fuse.FileSystem = &HelloFS{}
 
 func (fs *HelloFS) Open(
 	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.
-	if req.Inode == fuseutil.RootInodeID {
+	if req.Inode == fuse.RootInodeID {
 		return
 	}
 
 	// TODO(jacobsa): Handle others.
-	err = fuseutil.ENOSYS
+	err = fuse.ENOSYS
 	return
 }
diff --git a/samples/hello_fs_test.go b/samples/hello_fs_test.go
index 013f47e..153697f 100644
--- a/samples/hello_fs_test.go
+++ b/samples/hello_fs_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jacobsa/gcsfuse/fuseutil"
-	"github.com/jacobsa/gcsfuse/fuseutil/samples"
+	"github.com/jacobsa/fuse"
+	"github.com/jacobsa/fuse/samples"
 	"github.com/jacobsa/gcsfuse/timeutil"
 	. "github.com/jacobsa/ogletest"
 	"golang.org/x/net/context"
@@ -26,7 +26,7 @@ func TestHelloFS(t *testing.T) { RunTests(t) }
 
 type HelloFSTest struct {
 	clock timeutil.SimulatedClock
-	mfs   *fuseutil.MountedFileSystem
+	mfs   *fuse.MountedFileSystem
 }
 
 var _ SetUpInterface = &HelloFSTest{}
@@ -51,7 +51,7 @@ func (t *HelloFSTest) SetUp(ti *TestInfo) {
 		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())
 	}
 
diff --git a/server.go b/server.go
index 4498801..c7083c3 100644
--- a/server.go
+++ b/server.go
@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 // Author: jacobsa@google.com (Aaron Jacobs)
 
-package fuseutil
+package fuse
 
 import (
 	"fmt"