From e2a8e77cdc3fc533f2c16cb1c3d3293cf2301ede Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Wed, 25 Mar 2015 10:15:43 +1100
Subject: [PATCH] Replaced MountedFileSystem.Unmount with a free function.

---
 fuseutil/unmount.go    | 23 +++++++++++++++++++++++
 mounted_file_system.go |  9 ---------
 samples/unmount.go     |  4 +---
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 fuseutil/unmount.go

diff --git a/fuseutil/unmount.go b/fuseutil/unmount.go
new file mode 100644
index 0000000..b93c614
--- /dev/null
+++ b/fuseutil/unmount.go
@@ -0,0 +1,23 @@
+// Copyright 2015 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package fuse
+
+import "github.com/jacobsa/bazilfuse"
+
+// Attempt to unmount the file system whose mount point is the supplied
+// directory.
+func Unmount(dir string) {
+	return bazilfuse.Unmount(dir)
+}
diff --git a/mounted_file_system.go b/mounted_file_system.go
index ec98517..1b96e58 100644
--- a/mounted_file_system.go
+++ b/mounted_file_system.go
@@ -56,15 +56,6 @@ func (mfs *MountedFileSystem) Join(ctx context.Context) error {
 	}
 }
 
-// Attempt to unmount the file system. Use Join to wait for it to actually be
-// unmounted.
-//
-// TODO(jacobsa): Kill this in favor of an Unmount free function that can be
-// used even from outside of the daemon process.
-func (mfs *MountedFileSystem) Unmount() error {
-	return bazilfuse.Unmount(mfs.dir)
-}
-
 // Optional configuration accepted by Mount.
 type MountConfig struct {
 	// OS X only.
diff --git a/samples/unmount.go b/samples/unmount.go
index 37652e3..2d577aa 100644
--- a/samples/unmount.go
+++ b/samples/unmount.go
@@ -19,8 +19,6 @@ import (
 	"log"
 	"strings"
 	"time"
-
-	"github.com/jacobsa/bazilfuse"
 )
 
 // Unmount the file system mounted at the supplied directory. Try again on
@@ -30,7 +28,7 @@ import (
 func unmount(dir string) (err error) {
 	delay := 10 * time.Millisecond
 	for {
-		err = bazilfuse.Unmount(dir)
+		err = fuse.Unmount(dir)
 		if err == nil {
 			return
 		}