lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
chrislu 2024-08-07 10:46:29 -07:00
parent 57dc39c451
commit e86b0bcaaa
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
weed/mount/filehandle_map.go
View File

@ -9,7 +9,6 @@ import (
type FileHandleToInode struct { type FileHandleToInode struct {
sync.RWMutex sync.RWMutex
nextFh FileHandleId
inode2fh map[uint64]*FileHandle inode2fh map[uint64]*FileHandle
fh2inode map[FileHandleId]uint64 fh2inode map[FileHandleId]uint64
} }
@ -18,7 +17,6 @@ func NewFileHandleToInode() *FileHandleToInode {
return &FileHandleToInode{ return &FileHandleToInode{
inode2fh: make(map[uint64]*FileHandle), inode2fh: make(map[uint64]*FileHandle),
fh2inode: make(map[FileHandleId]uint64), fh2inode: make(map[FileHandleId]uint64),
nextFh: FileHandleId(util.RandomUint64()),
} }
} }
@ -44,8 +42,7 @@ func (i *FileHandleToInode) AcquireFileHandle(wfs *WFS, inode uint64, entry *fil
defer i.Unlock() defer i.Unlock()
fh, found := i.inode2fh[inode] fh, found := i.inode2fh[inode]
if !found { if !found {
fh = newFileHandle(wfs, i.nextFh, inode, entry) fh = newFileHandle(wfs, FileHandleId(util.RandomUint64()), inode, entry)
i.nextFh = FileHandleId(util.RandomUint64())
i.inode2fh[inode] = fh i.inode2fh[inode] = fh
i.fh2inode[fh.fh] = inode i.fh2inode[fh.fh] = inode
} else { } else {

5
weed/mount/weedfs_dir_read.go
View File

@ -44,10 +44,7 @@ func NewDirectoryHandleToInode() *DirectoryHandleToInode {
} }
func (wfs *WFS) AcquireDirectoryHandle() (DirectoryHandleId, *DirectoryHandle) { func (wfs *WFS) AcquireDirectoryHandle() (DirectoryHandleId, *DirectoryHandle) {
wfs.fhmap.Lock() fh := FileHandleId(util.RandomUint64())
fh := wfs.fhmap.nextFh
wfs.fhmap.nextFh = FileHandleId(util.RandomUint64())
wfs.fhmap.Unlock()
wfs.dhmap.Lock() wfs.dhmap.Lock()
defer wfs.dhmap.Unlock() defer wfs.dhmap.Unlock()