diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-09-24 18:21:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 18:21:34 -0700 |
| commit | 043b0631369bec00b33eb53cdf2cdef3eced006c (patch) | |
| tree | 72e1b320c3487aa5f6cb3cd5fc849bfd94108ec8 /weed/filesys/wfs.go | |
| parent | dbf5327b9874bf7137eb53cbe04cd362efeb864c (diff) | |
| parent | 48c578410fea2128f81356250b2cd9d56074d878 (diff) | |
| download | seaweedfs-043b0631369bec00b33eb53cdf2cdef3eced006c.tar.xz seaweedfs-043b0631369bec00b33eb53cdf2cdef3eced006c.zip | |
Merge pull request #1482 from hilimd/master
Fix: s3 delete object
Diffstat (limited to 'weed/filesys/wfs.go')
| -rw-r--r-- | weed/filesys/wfs.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index ff8e585d7..ef31a9258 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -37,9 +37,6 @@ type Option struct { EntryCacheTtl time.Duration Umask os.FileMode - MountUid uint32 - MountGid uint32 - MountMode os.FileMode MountCtime time.Time MountMtime time.Time @@ -88,7 +85,7 @@ func NewSeaweedFileSystem(option *Option) *WFS { cacheUniqueId := util.Md5String([]byte(option.FilerGrpcAddress + option.FilerMountRootPath + util.Version()))[0:4] cacheDir := path.Join(option.CacheDir, cacheUniqueId) if option.CacheSizeMB > 0 { - os.MkdirAll(cacheDir, os.FileMode(0777) &^ option.Umask) + os.MkdirAll(cacheDir, os.FileMode(0777)&^option.Umask) wfs.chunkCache = chunk_cache.NewTieredChunkCache(256, cacheDir, option.CacheSizeMB) } @@ -99,7 +96,8 @@ func NewSeaweedFileSystem(option *Option) *WFS { wfs.metaCache.Shutdown() }) - wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs} + entry, _ := filer_pb.GetEntry(wfs, util.FullPath(wfs.option.FilerMountRootPath)) + wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: entry} wfs.fsNodeCache = newFsCache(wfs.root) return wfs |