perf: avoid unnecessary fixAttrs

rueian · rueian · commit 2ee9fdcc98cd · 2025-05-09T15:20:21.000-07:00
Signed-off-by: Rueian &lt;rueiancsie@gmail.com&gt;
diff --git a/node.go b/node.go
@@ -223,7 +223,6 @@ func (n *FSNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut
 	n.mu.RLock()
 	if rf := n.rf; rf != nil {
 		defer n.mu.RUnlock()
-		defer n.fixAttr(&out.Attr, "")
 		return rf.Getattr(ctx, out)
 	}
 	n.mu.RUnlock()
@@ -237,7 +236,6 @@ func (n *FSNode) Setattr(ctx context.Context, f fs.FileHandle, in *fuse.SetAttrI
 	n.mu.Lock()
 	defer n.mu.Unlock()
 	if rf := n.rf; rf != nil {
-		defer n.fixAttr(&out.Attr, "")
 		return rf.Setattr(ctx, in, out)
 	}
 	if metadata := n.Metadata.(*FSNodeData); !n.IsDir() && !metadata.Ignore && in.Size < 1024 {
@@ -252,7 +250,6 @@ func (n *FSNode) Setattr(ctx context.Context, f fs.FileHandle, in *fuse.SetAttrI
 			}
 			defer syscall.Close(f)
 			rf := metadata.NewRemoteFile(ptr, ino, f)
-			defer n.fixAttr(&out.Attr, "")
 			return rf.Setattr(ctx, in, out)
 		}
 	}
@@ -280,7 +277,7 @@ func (n *FSNode) Listxattr(ctx context.Context, dest []byte) (uint32, syscall.Er
 }
 
 func (n *FSNode) fixAttr(out *fuse.Attr, name string) {
-	if n.IsDir() || n.Metadata.(*FSNodeData).Ignore || out.Size >= 1024 {
+	if (name == "" && n.IsDir()) || n.Metadata.(*FSNodeData).Ignore || out.Size >= 1024 {
 		return
 	}
 	defer recording("fixAttr", func() string { return filepath.Join(n.path(), name) })()

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ func (n FSNode) Getattr(ctx context.Context, f fs.FileHandle, out fuse.AttrOut`
`223`	`223`	`n.mu.RLock()`
`224`	`224`	`if rf := n.rf; rf != nil {`
`225`	`225`	`defer n.mu.RUnlock()`
`226`		`- defer n.fixAttr(&out.Attr, "")`
`227`	`226`	`return rf.Getattr(ctx, out)`
`228`	`227`	`}`
`229`	`228`	`n.mu.RUnlock()`
`@@ -237,7 +236,6 @@ func (n FSNode) Setattr(ctx context.Context, f fs.FileHandle, in fuse.SetAttrI`
`237`	`236`	`n.mu.Lock()`
`238`	`237`	`defer n.mu.Unlock()`
`239`	`238`	`if rf := n.rf; rf != nil {`
`240`		`- defer n.fixAttr(&out.Attr, "")`
`241`	`239`	`return rf.Setattr(ctx, in, out)`
`242`	`240`	`}`
`243`	`241`	`if metadata := n.Metadata.(*FSNodeData); !n.IsDir() && !metadata.Ignore && in.Size < 1024 {`
`@@ -252,7 +250,6 @@ func (n FSNode) Setattr(ctx context.Context, f fs.FileHandle, in fuse.SetAttrI`
`252`	`250`	`}`
`253`	`251`	`defer syscall.Close(f)`
`254`	`252`	`rf := metadata.NewRemoteFile(ptr, ino, f)`
`255`		`- defer n.fixAttr(&out.Attr, "")`
`256`	`253`	`return rf.Setattr(ctx, in, out)`
`257`	`254`	`}`
`258`	`255`	`}`
`@@ -280,7 +277,7 @@ func (n *FSNode) Listxattr(ctx context.Context, dest []byte) (uint32, syscall.Er`
`280`	`277`	`}`
`281`	`278`
`282`	`279`	`func (n FSNode) fixAttr(out fuse.Attr, name string) {`
`283`		`- if n.IsDir() \|\| n.Metadata.(*FSNodeData).Ignore \|\| out.Size >= 1024 {`
	`280`	`+ if (name == "" && n.IsDir()) \|\| n.Metadata.(*FSNodeData).Ignore \|\| out.Size >= 1024 {`
`284`	`281`	`return`
`285`	`282`	`}`
`286`	`283`	`defer recording("fixAttr", func() string { return filepath.Join(n.path(), name) })()`