vitalif
/
fusego
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed flushfs.

geesefs-0-30-9
Aaron Jacobs 2015-07-29 10:23:51 +10:00
parent 85b3f9ed42
commit c12f80b1e2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
samples/flushfs/flush_fs.go
View File

@ -180,8 +180,7 @@ func (fs *flushFS) ReadFile(
}
// Read what we can.
op.Data = make([]byte, op.Size)
copy(op.Data, fs.fooContents[op.Offset:])
op.BytesRead = copy(op.Dst, fs.fooContents[op.Offset:])
return
}
@ -298,13 +297,15 @@ func (fs *flushFS) ReadDir(
// Fill in the listing.
for _, de := range dirents {
op.Data = fuseutil.AppendDirent(op.Data, de)
}
n := fuseutil.WriteDirent(op.Dst[op.BytesRead:], de)
// We don't support doing this in anything more than one shot.
if len(op.Data) > op.Size {
err = fmt.Errorf("Couldn't fit listing in %v bytes", op.Size)
return
// We don't support doing this in anything more than one shot.
if n == 0 {
err = fmt.Errorf("Couldn't fit listing in %v bytes", len(op.Dst))
return
}
op.BytesRead += n
}
return