Replaced MountedFileSystem.Unmount with a free function.
parent
2c10dd18ca
commit
e2a8e77cdc
|
@ -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)
|
||||||
|
}
|
|
@ -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.
|
// Optional configuration accepted by Mount.
|
||||||
type MountConfig struct {
|
type MountConfig struct {
|
||||||
// OS X only.
|
// OS X only.
|
||||||
|
|
|
@ -19,8 +19,6 @@ import (
|
||||||
"log"
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/jacobsa/bazilfuse"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Unmount the file system mounted at the supplied directory. Try again on
|
// Unmount the file system mounted at the supplied directory. Try again on
|
||||||
|
@ -30,7 +28,7 @@ import (
|
||||||
func unmount(dir string) (err error) {
|
func unmount(dir string) (err error) {
|
||||||
delay := 10 * time.Millisecond
|
delay := 10 * time.Millisecond
|
||||||
for {
|
for {
|
||||||
err = bazilfuse.Unmount(dir)
|
err = fuse.Unmount(dir)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue