X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fopen.c;h=dad353480fffe872cc82a90f0a773e566e604aba;hp=3e3b083e59d788906169b3fc0dcaf5ae9d9a3571;hb=5c559e7df1d31b4c0ddf26451fac972dc8a0c2c9;hpb=b8e64e9346793164651a36eccb3c205077e5c91b

diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index 3e3b083e..dad35348 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -706,7 +706,7 @@ finished:
 		berr = tdb_needs_recovery(tdb);
 		if (unlikely(berr != false)) {
 			if (berr < 0) {
-				ecode = berr;
+				ecode = TDB_OFF_TO_ERR(berr);
 				goto fail;
 			}
 			ecode = tdb_lock_and_recover(tdb);
@@ -727,18 +727,18 @@ finished:
 
  fail:
 	/* Map ecode to some logical errno. */
-	switch (ecode) {
-	case TDB_ERR_CORRUPT:
-	case TDB_ERR_IO:
+	switch (TDB_ERR_TO_OFF(ecode)) {
+	case TDB_ERR_TO_OFF(TDB_ERR_CORRUPT):
+	case TDB_ERR_TO_OFF(TDB_ERR_IO):
 		saved_errno = EIO;
 		break;
-	case TDB_ERR_LOCK:
+	case TDB_ERR_TO_OFF(TDB_ERR_LOCK):
 		saved_errno = EWOULDBLOCK;
 		break;
-	case TDB_ERR_OOM:
+	case TDB_ERR_TO_OFF(TDB_ERR_OOM):
 		saved_errno = ENOMEM;
 		break;
-	case TDB_ERR_EINVAL:
+	case TDB_ERR_TO_OFF(TDB_ERR_EINVAL):
 		saved_errno = EINVAL;
 		break;
 	default: