diff options
Diffstat (limited to 'weed/filesys')
| -rw-r--r-- | weed/filesys/dir.go | 6 | ||||
| -rw-r--r-- | weed/filesys/wfs.go | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 574749ef0..7d93dbd9f 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -82,9 +82,9 @@ func (dir *Dir) Getxattr(ctx context.Context, req *fuse.GetxattrRequest, resp *f func (dir *Dir) setRootDirAttributes(attr *fuse.Attr) { attr.Inode = 1 // filer2.FullPath(dir.Path).AsInode() attr.Valid = time.Hour - attr.Uid = dir.wfs.option.MountUid - attr.Gid = dir.wfs.option.MountGid - attr.Mode = dir.wfs.option.MountMode + attr.Uid = dir.entry.Attributes.Uid + attr.Gid = dir.entry.Attributes.Gid + attr.Mode = os.FileMode(dir.entry.Attributes.FileMode) attr.Crtime = dir.wfs.option.MountCtime attr.Ctime = dir.wfs.option.MountCtime attr.Mtime = dir.wfs.option.MountMtime 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 |