Add . and .. to list calls in fuse3

Author: jfantinhardesty

component/libfuse/libfuse2_handler.go

@@ -28,10 +28,13 @@ package libfuse
 import (
 	"errors"
 	"fmt"
+	"hash/fnv"
 	"io"
 	"io/fs"
 	"os"
+	"path"
 	"runtime"
+	"strings"
 	"syscall"
 	"time"
 
@@ -200,6 +203,7 @@ func (lf *Libfuse) fillStat(attr *internal.ObjAttr, stbuf *fuse.Stat_t) {
 	stbuf.Gid = lf.ownerGID
 	stbuf.Nlink = 1
 	stbuf.Size = attr.Size
+	stbuf.Ino = inodeForAttr(attr)
 
 	// Populate mode
 	// Backing storage implementation has support for mode.
@@ -264,7 +268,7 @@ func (cf *CgofuseFS) Getattr(path string, stat *fuse.Stat_t, fh uint64) int {
 	// log.Trace("Libfuse::Getattr : %s", name)
 
 	// Return the default configuration for the root
-	if name == "" {
+	if name == "" || name == "." || name == ".." {
 		stat.Mode = fuse.S_IFDIR | 0777
 		stat.Uid = cf.uid
 		stat.Gid = cf.gid
@@ -273,6 +277,7 @@ func (cf *CgofuseFS) Getattr(path string, stat *fuse.Stat_t, fh uint64) int {
 		stat.Mtim = fuse.NewTimespec(time.Now())
 		stat.Atim = stat.Mtim
 		stat.Ctim = stat.Mtim
+		stat.Ino = inodeForPath(name)
 		return 0
 	}
 
@@ -462,7 +467,7 @@ func (cf *CgofuseFS) Readdir(
 	newRequest := offset == 0
 	if newRequest {
 		// cache the first two entries ('.' & '..')
-		cacheDots(cacheInfo)
+		cacheDots(cacheInfo, handle.Path)
 	}
 	startOffset := offset
 	// fetch and serve directory contents back to the OS in a loop until their buffer is full
@@ -516,11 +521,14 @@ type fillFunc = func(name string, stat *fuse.Stat_t, ofst int64) bool
 
 // add the first two entries in any directory listing ('.' and '..') to the cache
 // this replaces any existing cache
-func cacheDots(cacheInfo *dirChildCache) {
-	dotAttrs := []*internal.ObjAttr{
-		{Flags: fuseFS.lsFlags, Name: "."},
-		{Flags: fuseFS.lsFlags, Name: ".."},
-	}
+func cacheDots(cacheInfo *dirChildCache, dirPath string) {
+	currentDir := internal.CreateObjAttrDir(dirPath)
+	currentDir.Name = "."
+	parentPath := strings.TrimSuffix(dirPath, "/")
+	parentPath = path.Dir(parentPath)
+	parentDir := internal.CreateObjAttrDir(parentPath)
+	parentDir.Name = ".."
+	dotAttrs := []*internal.ObjAttr{currentDir, parentDir}
 	cacheInfo.sIndex = 0
 	cacheInfo.eIndex = 2
 	cacheInfo.length = 2
@@ -530,6 +538,22 @@ func cacheDots(cacheInfo *dirChildCache) {
 	cacheInfo.lastPage = false
 }
 
+func inodeForAttr(attr *internal.ObjAttr) uint64 {
+	if attr == nil {
+		return 0
+	}
+	if attr.Path != "" {
+		return inodeForPath(attr.Path)
+	}
+	return inodeForPath(attr.Name)
+}
+
+func inodeForPath(p string) uint64 {
+	h := fnv.New64a()
+	_, _ = h.Write([]byte(p))
+	return h.Sum64()
+}
+
 // Fill the directory list cache with data from the next component
 func populateDirChildCache(
 	handle *handlemap.Handle,

component/libfuse/libfuse2_handler_test_wrapper.go

@@ -238,7 +238,7 @@ func testReaddirEmptyPageToken(suite *libfuseTestSuite) {
 		length:   0,
 		children: make([]*internal.ObjAttr, 0),
 	}
-	cacheDots(cacheInfo)
+	cacheDots(cacheInfo, "dir/")
 	cacheInfo.token = "next"
 	cacheInfo.lastPage = false
 	handle.SetValue("cache", cacheInfo)
@@ -260,6 +260,36 @@ func testReaddirEmptyPageToken(suite *libfuseTestSuite) {
 	suite.assert.False(fillCalled)
 }
 
+func testReaddirNonZeroOffsetCachesDots(suite *libfuseTestSuite) {
+	defer suite.cleanupTest()
+
+	handle := handlemap.NewHandle("dir/")
+	cacheInfo := &dirChildCache{
+		sIndex:   0,
+		eIndex:   0,
+		token:    "",
+		length:   0,
+		children: make([]*internal.ObjAttr, 0),
+	}
+	handle.SetValue("cache", cacheInfo)
+	fh := handlemap.Add(handle)
+	defer handlemap.Delete(handle.ID)
+
+	suite.mock.EXPECT().
+		StreamDir(internal.StreamDirOptions{Name: "dir/", Token: ""}).
+		Return([]*internal.ObjAttr{}, "", nil)
+
+	var names []string
+	fill := func(name string, stat *fuse.Stat_t, ofst int64) bool {
+		names = append(names, name)
+		return true
+	}
+
+	err := cfuseFS.Readdir("/dir", fill, 1, uint64(fh))
+	suite.assert.Equal(0, err)
+	suite.assert.Equal([]string{".", ".."}, names)
+}
+
 func testRmDir(suite *libfuseTestSuite) {
 	defer suite.cleanupTest()
 	name := "path"