diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-06-21 18:51:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 18:51:00 +0800 |
| commit | 9012863ad78bca17f768b83324be8a26ddb34657 (patch) | |
| tree | 62ad304b75317713c5c625d3fce5a325c41cb434 /swarm/fuse/swarmfs_unix.go | |
| parent | a5d08c893d61f66d60d8a91216aee5347b78f93e (diff) | |
| parent | 98e101ef8ef4e9d7cfa90bbac967fa20c5156adf (diff) | |
| download | dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar.gz dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar.bz2 dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar.lz dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar.xz dexon-9012863ad78bca17f768b83324be8a26ddb34657.tar.zst dexon-9012863ad78bca17f768b83324be8a26ddb34657.zip | |
Merge pull request #14667 from fjl/swarm-fuse-cleanup
swarm/fuse: simplify externalUnmount, use subtests
Diffstat (limited to 'swarm/fuse/swarmfs_unix.go')
| -rw-r--r-- | swarm/fuse/swarmfs_unix.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/swarm/fuse/swarmfs_unix.go b/swarm/fuse/swarmfs_unix.go index f4eecef24..1a8390a4b 100644 --- a/swarm/fuse/swarmfs_unix.go +++ b/swarm/fuse/swarmfs_unix.go @@ -19,18 +19,19 @@ package fuse import ( - "bazil.org/fuse" - "bazil.org/fuse/fs" "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/swarm/api" "os" "path/filepath" "strings" "sync" "time" + + "bazil.org/fuse" + "bazil.org/fuse/fs" + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/log" + "github.com/ethereum/go-ethereum/swarm/api" ) var ( @@ -203,7 +204,7 @@ func (self *SwarmFS) Unmount(mountpoint string) (*MountInfo, error) { } err = fuse.Unmount(cleanedMountPoint) if err != nil { - err1 := externalUnMount(cleanedMountPoint) + err1 := externalUnmount(cleanedMountPoint) if err1 != nil { errStr := fmt.Sprintf("UnMount error: %v", err) log.Warn(errStr) |