diff options
| author | Robert Coelho <me@iscoelho.com> | 2022-05-24 12:48:32 -0400 |
|---|---|---|
| committer | Robert Coelho <me@iscoelho.com> | 2022-05-24 12:48:32 -0400 |
| commit | 1fabbe8a25f8cd4183589f728dcf9a5031905b2d (patch) | |
| tree | 8a7cb359948a4306790f88e647d2cf8aeb1cd751 /weed/mount/weedfs_dir_read.go | |
| parent | cb422d96f7976c35838d6d392c23931b58f7b723 (diff) | |
| download | seaweedfs-1fabbe8a25f8cd4183589f728dcf9a5031905b2d.tar.xz seaweedfs-1fabbe8a25f8cd4183589f728dcf9a5031905b2d.zip | |
mount: cleanup ReadDir rewrite's branches to not assume offsets
Diffstat (limited to 'weed/mount/weedfs_dir_read.go')
| -rw-r--r-- | weed/mount/weedfs_dir_read.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/mount/weedfs_dir_read.go b/weed/mount/weedfs_dir_read.go index 6250283ca..6e65bec13 100644 --- a/weed/mount/weedfs_dir_read.go +++ b/weed/mount/weedfs_dir_read.go @@ -141,7 +141,7 @@ func (wfs *WFS) doReadDirectory(input *fuse.ReadIn, out *fuse.DirEntryList, isPl dh := wfs.GetDirectoryHandle(DirectoryHandleId(input.Fh)) if input.Offset == 0 { dh.reset() - } else if dh.isFinished && input.Offset >= directoryStreamBaseOffset { + } else if dh.isFinished && input.Offset >= dh.entryStreamOffset { entryCurrentIndex := input.Offset - dh.entryStreamOffset if uint64(len(dh.entryStream)) <= entryCurrentIndex { return fuse.OK @@ -196,8 +196,8 @@ func (wfs *WFS) doReadDirectory(input *fuse.ReadIn, out *fuse.DirEntryList, isPl } var lastEntryName string - if input.Offset >= directoryStreamBaseOffset { - if input.Offset > directoryStreamBaseOffset { + if input.Offset >= dh.entryStreamOffset { + if input.Offset > dh.entryStreamOffset { entryPreviousIndex := (input.Offset - dh.entryStreamOffset) - 1 if uint64(len(dh.entryStream)) > entryPreviousIndex { lastEntryName = dh.entryStream[entryPreviousIndex].Name() |