Commit 5eed9093 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 439dcf16
...@@ -1211,18 +1211,17 @@ error _Mapping::unmap() { ...@@ -1211,18 +1211,17 @@ error _Mapping::unmap() {
// - f.wconn.atMu // - f.wconn.atMu
// - f._mmapMu // - f._mmapMu
error _Mapping::_remmapblk(int64_t blk, zodb::Tid at) { error _Mapping::_remmapblk(int64_t blk, zodb::Tid at) {
_Mapping& mmap = *this;
_Mapping *mmap = this; FileH f = mmap.fileh;
FileH f = mmap->fileh;
xerr::Contextf E("_remmapblk #%ld @%s", blk, v(at)); xerr::Contextf E("_remmapblk #%ld @%s", blk, v(at));
etrace(""); etrace("");
ASSERT(mmap->blk_start <= blk && blk < mmap->blk_stop()); ASSERT(mmap.blk_start <= blk && blk < mmap.blk_stop());
// a mmapping is efaulted only for closed files, i.e. fileh is removed from wconn._filehTab // a mmapping is efaulted only for closed files, i.e. fileh is removed from wconn._filehTab
// -> pinner should not see the fileh and so should not see this mapping. // -> pinner should not see the fileh and so should not see this mapping.
ASSERT(!mmap->efaulted); ASSERT(!mmap.efaulted);
uint8_t *blkmem = mmap->mem_start + (blk - mmap->blk_start)*f->blksize; uint8_t *blkmem = mmap.mem_start + (blk - mmap.blk_start)*f->blksize;
error err; error err;
os::File fsfile; os::File fsfile;
bool fclose = false; bool fclose = false;
......
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