aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2020-07-18 23:06:22 +0200
committerJakob Unterwurzacher2020-07-18 23:40:54 +0200
commit6b7ff09373971238456b11014b5197f9c3558ef5 (patch)
tree784b3a79a5a139bcfb5ba6b021baa7da600c74ef
parent7eae35e2d317f737cd69afdf88539c5d29b91296 (diff)
v2api: Node: make Path() public
Helpful for fsck.
-rw-r--r--internal/fusefrontend/node.go8
-rw-r--r--internal/fusefrontend/node_dir_ops.go6
2 files changed, 7 insertions, 7 deletions
diff --git a/internal/fusefrontend/node.go b/internal/fusefrontend/node.go
index 48447bb..01cc9c3 100644
--- a/internal/fusefrontend/node.go
+++ b/internal/fusefrontend/node.go
@@ -22,9 +22,9 @@ type Node struct {
fs.Inode
}
-// path returns the relative plaintext path of this node
-func (n *Node) path() string {
- return n.Path(n.Root())
+// Path returns the relative plaintext path of this node
+func (n *Node) Path() string {
+ return n.Inode.Path(n.Root())
}
// rootNode returns the Root Node of the filesystem.
@@ -40,7 +40,7 @@ func (n *Node) rootNode() *RootNode {
// a child of this node.
// If `child` is empty, the (dirfd, cName) pair refers to this node itself.
func (n *Node) prepareAtSyscall(child string) (dirfd int, cName string, errno syscall.Errno) {
- p := n.path()
+ p := n.Path()
if child != "" {
p = filepath.Join(p, child)
}
diff --git a/internal/fusefrontend/node_dir_ops.go b/internal/fusefrontend/node_dir_ops.go
index 8cc158d..066e791 100644
--- a/internal/fusefrontend/node_dir_ops.go
+++ b/internal/fusefrontend/node_dir_ops.go
@@ -55,7 +55,7 @@ func (n *Node) mkdirWithIv(dirfd int, cName string, mode uint32, caller *fuse.Ca
// Symlink-safe through use of Mkdirat().
func (n *Node) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
rn := n.rootNode()
- newPath := filepath.Join(n.path(), name)
+ newPath := filepath.Join(n.Path(), name)
if rn.isFiltered(newPath) {
return nil, syscall.EPERM
}
@@ -147,7 +147,7 @@ func (n *Node) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.En
// ReadDirIVAt().
func (n *Node) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
rn := n.rootNode()
- p := n.path()
+ p := n.Path()
dirName := filepath.Base(p)
parentDirFd, cDirName, err := rn.openBackingDir(p)
if err != nil {
@@ -232,7 +232,7 @@ func (n *Node) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
// Symlink-safe through Unlinkat() + AT_REMOVEDIR.
func (n *Node) Rmdir(ctx context.Context, name string) (code syscall.Errno) {
rn := n.rootNode()
- p := filepath.Join(n.path(), name)
+ p := filepath.Join(n.Path(), name)
parentDirFd, cName, err := rn.openBackingDir(p)
if err != nil {
return fs.ToErrno(err)