Replaced MountedFileSystem.Unmount with a free function.

The free function is more flexible, including being able to be used from
outside the daemon process.
geesefs-0-30-9
Aaron Jacobs 2015-03-25 10:17:11 +11:00
commit 14ea5a9db1
3 changed files with 25 additions and 11 deletions

View File

@ -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.

View File

@ -20,7 +20,7 @@ import (
"strings"
"time"
"github.com/jacobsa/bazilfuse"
"github.com/jacobsa/fuse"
)
// Unmount the file system mounted at the supplied directory. Try again on
@ -30,7 +30,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
}

23
unmount.go Normal file
View File

@ -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) error {
return bazilfuse.Unmount(dir)
}