diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-01-18 00:19:19 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-01-18 00:19:19 -0800 |
| commit | 4085b79d389ba2566b4a6b7f3dce7f1fca8d481b (patch) | |
| tree | 4eaa5853198762cb272c503f0c6da9b6b2201080 | |
| parent | 3d5cb7eb86cc1eb8971caaa27fd8cc27b7cc2d5d (diff) | |
| download | seaweedfs-4085b79d389ba2566b4a6b7f3dce7f1fca8d481b.tar.xz seaweedfs-4085b79d389ba2566b4a6b7f3dce7f1fca8d481b.zip | |
Revert "mount: add more entry type"
This reverts commit d7d907be27e2441f54fac70b6723d6a41ae62af8.
| -rw-r--r-- | weed/filesys/dir.go | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 35527546b..2cc332635 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -6,7 +6,6 @@ import ( "math" "os" "strings" - "syscall" "time" "github.com/seaweedfs/fuse" @@ -309,7 +308,7 @@ func (dir *Dir) ReadDirAll(ctx context.Context) (ret []fuse.Dirent, err error) { dirent := fuse.Dirent{Inode: inode, Name: entry.Name, Type: fuse.DT_Dir} ret = append(ret, dirent) } else { - dirent := fuse.Dirent{Inode: inode, Name: entry.Name, Type: findFileType(uint16(entry.Attributes.FileMode))} + dirent := fuse.Dirent{Inode: inode, Name: entry.Name, Type: fuse.DT_File} ret = append(ret, dirent) } return nil @@ -331,26 +330,6 @@ func (dir *Dir) ReadDirAll(ctx context.Context) (ret []fuse.Dirent, err error) { return } -func findFileType(mode uint16) fuse.DirentType { - switch mode & (syscall.S_IFMT & 0xffff) { - case syscall.S_IFSOCK: - return fuse.DT_Socket - case syscall.S_IFLNK: - return fuse.DT_Link - case syscall.S_IFREG: - return fuse.DT_File - case syscall.S_IFBLK: - return fuse.DT_Block - case syscall.S_IFDIR: - return fuse.DT_Dir - case syscall.S_IFCHR: - return fuse.DT_Char - case syscall.S_IFIFO: - return fuse.DT_FIFO - } - return fuse.DT_File -} - func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { if !req.Dir { |