Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
go-fuse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Levin Zimmermann
go-fuse
Commits
74851f1f
Commit
74851f1f
authored
Apr 10, 2023
by
Han-Wen Nienhuys
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
newunionfs: make readdir deterministic
Change-Id: Ieba742bdbe830fdc18f82986694e2cd4d7caf161
parent
8cbe92c1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
newunionfs/unionfs.go
newunionfs/unionfs.go
+12
-1
No files found.
newunionfs/unionfs.go
View file @
74851f1f
...
@@ -346,18 +346,29 @@ func (n *unionFSNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno)
...
@@ -346,18 +346,29 @@ func (n *unionFSNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno)
// deepest root first.
// deepest root first.
readRoot
(
root
.
roots
[
len
(
root
.
roots
)
-
i
-
1
],
dir
,
names
)
readRoot
(
root
.
roots
[
len
(
root
.
roots
)
-
i
-
1
],
dir
,
names
)
}
}
result
:=
make
([]
fuse
.
DirEntry
,
0
,
len
(
names
))
result
:=
make
([]
fuse
.
DirEntry
,
0
,
2
*
len
(
names
))
maxIdx
:=
-
1
maxName
:=
""
for
nm
,
mode
:=
range
names
{
for
nm
,
mode
:=
range
names
{
marker
:=
filePathHash
(
filepath
.
Join
(
dir
,
nm
))
marker
:=
filePathHash
(
filepath
.
Join
(
dir
,
nm
))
if
_
,
ok
:=
markers
[
marker
];
ok
{
if
_
,
ok
:=
markers
[
marker
];
ok
{
continue
continue
}
}
if
nm
>
maxName
{
maxName
=
nm
maxIdx
=
len
(
result
)
}
result
=
append
(
result
,
fuse
.
DirEntry
{
result
=
append
(
result
,
fuse
.
DirEntry
{
Name
:
nm
,
Name
:
nm
,
Mode
:
mode
,
Mode
:
mode
,
})
})
}
}
if
len
(
result
)
>
0
{
result
=
append
(
result
[
maxIdx
:
],
result
[
:
maxIdx
]
...
)
}
return
fs
.
NewListDirStream
(
result
),
0
return
fs
.
NewListDirStream
(
result
),
0
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment