gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
chrislu
2022-02-12 01:59:36 -08:00
parent f4d88862c4
commit a10c28ba82
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
weed/mount/weedfs_attr.go
View File

@@ -20,11 +20,9 @@ func (wfs *WFS) GetAttr(cancel <-chan struct{}, input *fuse.GetAttrIn, out *fuse
if status != fuse.OK { if status != fuse.OK {
return status return status
} }
if entry.IsDirectory { wfs.setOutAttr(out, input.NodeId, entry)
} return fuse.OK
return fuse.ENOSYS
} }
func (wfs *WFS) SetAttr(cancel <-chan struct{}, input *fuse.SetAttrIn, out *fuse.AttrOut) (code fuse.Status) { func (wfs *WFS) SetAttr(cancel <-chan struct{}, input *fuse.SetAttrIn, out *fuse.AttrOut) (code fuse.Status) {
@@ -56,7 +54,7 @@ func (wfs *WFS) setRootAttr(out *fuse.AttrOut) {
out.Mtime = now out.Mtime = now
out.Ctime = now out.Ctime = now
out.Atime = now out.Atime = now
out.Mode = uint32(syscall.S_IFDIR | wfs.option.MountMode) out.Mode = osToSystemMode(os.ModeDir) | uint32(wfs.option.MountMode)
out.Nlink = 1 out.Nlink = 1
} }
@@ -65,7 +63,7 @@ func (wfs *WFS) setOutAttr(out *fuse.AttrOut, inode uint64, entry *filer_pb.Entr
out.Ino = inode out.Ino = inode
out.Uid = entry.Attributes.Uid out.Uid = entry.Attributes.Uid
out.Gid = entry.Attributes.Gid out.Gid = entry.Attributes.Gid
out.Mode = entry.Attributes.FileMode out.Mode = modeToSystemMode(entry.Attributes.FileMode)
out.Mtime = uint64(entry.Attributes.Mtime) out.Mtime = uint64(entry.Attributes.Mtime)
out.Ctime = uint64(entry.Attributes.Mtime) out.Ctime = uint64(entry.Attributes.Mtime)
out.Atime = uint64(entry.Attributes.Mtime) out.Atime = uint64(entry.Attributes.Mtime)
@@ -78,8 +76,12 @@ func (wfs *WFS) setOutAttr(out *fuse.AttrOut, inode uint64, entry *filer_pb.Entr
out.Nlink = 1 out.Nlink = 1
} }
func modeToSystemMode(mode uint32) uint32 {
return osToSystemMode(os.FileMode(mode)) | mode
}
func osToSystemMode(mode os.FileMode) uint32 { func osToSystemMode(mode os.FileMode) uint32 {
switch mode & 0x7F { switch mode & os.ModeType {
case os.ModeDir: case os.ModeDir:
return syscall.S_IFDIR return syscall.S_IFDIR
case os.ModeSymlink: case os.ModeSymlink: