.

bigfile/file_zodb.cpp

@@ -55,7 +55,10 @@ static int zfile_remmap_blk_read(VMA *vma, BigFile *file, blk_t blk) {
     wcfs::_Mapping *mmap = static_cast<wcfs::_Mapping*>(vma->mmap_overlay_server);
     // XXX use file?
 
-    mmap->remmap_blk(blk);  // XXX err
+    error err;
+    err = mmap->remmap_blk(blk);
+    if (err != nil)
+        panic(v(err));  // XXX
     return 0;
 }
 

wcfs/client/wcfs.cpp

@@ -586,7 +586,7 @@ error _Mapping::_remmapblk(int64_t blk, zodb::Tid at) {
 
 // remmap_blk remmaps file[blk] in its place again.
 // virtmem calls this to remmap a block after RW dirty page was e.g. discarded.
-void _Mapping::remmap_blk(int64_t blk) {
+error _Mapping::remmap_blk(int64_t blk) {
     _Mapping& mmap = *this;
 
     // XXX locking
@@ -601,7 +601,9 @@ void _Mapping::remmap_blk(int64_t blk) {
 
     error err = mmap._remmapblk(blk, blkrev);
     if (err != nil)
-        panic(v(err)); // XXX
+        return err; // errctx is good in _remmapblk
+
+    return nil;
 }
 
 // unmap removes mapping memory from address space.

wcfs/client/wcfs.h

@@ -254,7 +254,7 @@ struct _Mapping : object {
     }
 
     error _remmapblk(int64_t blk, zodb::Tid at);
-    void  remmap_blk(int64_t blk); // for virtmem-only
+    error remmap_blk(int64_t blk); // for virtmem-only
     error unmap();
 
     // don't new - create via FileH.mmap