Commit b02df882 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

nodefs: fix overflow handling in READDIRPLUS

parent d5a1bca6
...@@ -596,12 +596,6 @@ func (b *rawBridge) ReadDirPlus(input *fuse.ReadIn, out *fuse.DirEntryList) fuse ...@@ -596,12 +596,6 @@ func (b *rawBridge) ReadDirPlus(input *fuse.ReadIn, out *fuse.DirEntryList) fuse
return code return code
} }
if f.hasOverflow {
// always succeeds.
out.AddDirEntry(f.overflow)
f.hasOverflow = false
}
for f.dirStream.HasNext() { for f.dirStream.HasNext() {
var e fuse.DirEntry var e fuse.DirEntry
var code fuse.Status var code fuse.Status
......
...@@ -502,7 +502,7 @@ func TestReadDir(t *testing.T) { ...@@ -502,7 +502,7 @@ func TestReadDir(t *testing.T) {
// XXX what about ".." and "." ? // XXX what about ".." and "." ?
want := map[string]bool{} want := map[string]bool{}
for i := 0; i < 2; i++ { for i := 0; i < 110; i++ {
// 40 bytes of filename, so 110 entries overflows a // 40 bytes of filename, so 110 entries overflows a
// 4096 page. // 4096 page.
nm := fmt.Sprintf("file%036x", i) nm := fmt.Sprintf("file%036x", i)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment