diff options
Diffstat (limited to 'netfs/fuse/fuseFiles.cpp')
| -rw-r--r-- | netfs/fuse/fuseFiles.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netfs/fuse/fuseFiles.cpp b/netfs/fuse/fuseFiles.cpp index 3d23338..1ab568c 100644 --- a/netfs/fuse/fuseFiles.cpp +++ b/netfs/fuse/fuseFiles.cpp @@ -14,7 +14,7 @@ namespace NetFS { } template<> - std::map<int, FuseApp::OpenFilePtr> & + std::map<FuseApp::FuseHandleTypeId, FuseApp::OpenFilePtr> & FuseApp::getMap<FuseApp::OpenFilePtr>() { return openFiles; @@ -48,7 +48,7 @@ namespace NetFS { FuseApp::OpenFile::BGs::interval_type FuseApp::OpenFile::range(off_t o, size_t s) { - return OpenFile::BGs::interval_type::right_open(o, o + s); + return OpenFile::BGs::interval_type::right_open(safe {o}, safe {o} + s); } int @@ -125,7 +125,7 @@ namespace NetFS { } else { std::vector<std::shared_ptr<OpenFile::WriteState>> overlap; - overlap.reserve(std::distance(R.first, R.second)); + overlap.reserve(safe {std::distance(R.first, R.second)}); for (auto i = R.first; i != R.second; i++) { overlap.push_back(i->second); } @@ -175,7 +175,7 @@ namespace NetFS { waitOnWriteRangeAndThen<void>(s, o, of, [o, s, buf, &of, remote](const auto & key) { auto p = std::make_shared<OpenFile::WriteState>(); remote->writeAsync( - o, s, Buffer(buf, buf + s), + o, safe {s}, Buffer(buf, buf + s), [p, of, key]() { p->promise.set_value(); ScopeLock(of->_lock) { |