gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(client): Fixed issues #3935 readdir offset

Browse Source 
Signed-off-by: linfangrong <linfangrong.liuxin@qq.com>
This commit is contained in:
linfangrong 2025-09-25 19:10:18 +08:00 committed by leonrayang
parent b8c65c199c
commit 77940d0e53
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/fs/dir.go
View File

@ -54,7 +54,7 @@ func NewDirContexts() (dctx *DirContexts) {
return
}
func (dctx *DirContexts) GetCopy(handle fuse.HandleID) DirContext {
func (dctx *DirContexts) GetCopy(handle fuse.HandleID) (DirContext, bool) {
dctx.RLock()
if dctx.dirCtx == nil {
dctx.RUnlock()
@ -64,9 +64,9 @@ func (dctx *DirContexts) GetCopy(handle fuse.HandleID) DirContext {
dctx.RUnlock()
if found {
return DirContext{dirCtx.Name}
return DirContext{dirCtx.Name}, true
} else {
return DirContext{}
return DirContext{}, false
}
}
@ -462,15 +462,16 @@ func (d *Dir) ReadDir(ctx context.Context, req *fuse.ReadRequest, resp *fuse.Rea
metric.SetWithLabels(err, map[string]string{exporter.Vol: d.super.volname})
d.super.runningMonitor.SubClientOp(runningStat, err)
}()
var dirCtx DirContext = d.dctx.GetCopy(req.Handle)
dirCtx, found := d.dctx.GetCopy(req.Handle)
children, err := d.super.mw.ReadDirLimit_ll(d.info.Inode, dirCtx.Name, limit)
if err != nil {
log.LogErrorf("readdirlimit: Readdir: ino(%v) err(%v) offset %v", d.info.Inode, err, req.Offset)
return make([]fuse.Dirent, 0), ParseError(err)
}
if req.Offset == 0 && dirCtx.Name == "" {
if dirCtx.Name == "" && !found {
if len(children) == 0 {
d.dctx.Put(req.Handle, &dirCtx)
dirents := make([]fuse.Dirent, 0, len(children))
dirents = append(dirents, fuse.Dirent{
Inode: d.info.Inode,