TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-09 20:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #67: dwarfs I/O hangs if call to to fuse_reply_iov fails

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2021-11-20 15:36:24 +01:00
parent 14654b6f38
commit 075194067a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dwarfs.cpp
View File

@ -329,16 +329,21 @@ void op_read(fuse_req_t req, fuse_ino_t ino, size_t size, off_t off,
iovec_read_buf buf; iovec_read_buf buf;
ssize_t rv = userdata->fs.readv(ino, buf, size, off); ssize_t rv = userdata->fs.readv(ino, buf, size, off);
// std::cerr << ">>> " << rv << std::endl; LOG_DEBUG << "readv(" << ino << ", " << size << ", " << off << ") -> "
<< rv << " [size = " << buf.buf.size() << "]";
if (rv >= 0) { if (rv >= 0) {
fuse_reply_iov(req, buf.buf.empty() ? nullptr : &buf.buf[0], int frv = fuse_reply_iov(req, buf.buf.empty() ? nullptr : &buf.buf[0],
buf.buf.size()); buf.buf.size());
if (frv == 0) {
return; return;
} }
err = -frv;
} else {
err = -rv; err = -rv;
}
} else { } else {
err = EIO; err = EIO;
} }