.

wcfs/client/wcfs.cpp

@@ -1184,7 +1184,7 @@ error _Mapping::_remmapblk(int64_t blk, zodb::Tid at) {
 
     _Mapping *mmap = this;
     FileH f = mmap->fileh;
-    xerr::Contextf E("%s: %s: %s: remmapblk #%ld @%s", v(f->wconn), v(f), v(mmap), blk, v(at));
+    xerr::Contextf E("_remmapblk #%ld @%s", blk, v(at));
     etrace("");
 
     ASSERT(mmap->blk_start <= blk && blk < mmap->blk_stop());
@@ -1254,6 +1254,9 @@ error _Mapping::remmap_blk(int64_t blk) {
         f->wconn->_atMu.RUnlock();
     });
 
+    xerr::Contextf E("%s: %s: %s: remmapblk #%ld", v(f->wconn), v(f), v(mmap), blk);
+    etrace("");
+
     if (!(mmap.blk_start <= blk && blk < mmap.blk_stop()))
         panic("remmap_blk: blk out of Mapping range");
 
@@ -1261,7 +1264,7 @@ error _Mapping::remmap_blk(int64_t blk) {
     // remmap base-layer blk memory in its place again, we reinject efault into it.
     if (mmap.efaulted) {
         log::Warnf("%s: remmapblk called for already-efaulted mapping", v(mmap));
-        return mmap.__remmapBlkAsEfault(blk); // TODO recheck errctx
+        return E(mmap.__remmapBlkAsEfault(blk));
     }
 
     // blkrev = rev | @head
@@ -1272,7 +1275,7 @@ error _Mapping::remmap_blk(int64_t blk) {
 
     err = mmap._remmapblk(blk, blkrev);
     if (err != nil)
-        return err; // errctx is good in _remmapblk
+        return E(err);
 
     return nil;
 }