X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=38124582d125625766922e4dab802ca22de2ce82;hp=58a62cb400da905dba1fbae3845ed4a0d1f47dbe;hb=02d83e6adfd34fe62aa4fe2bc4dbc3c4a13bd5f6;hpb=587982955ca9c61363d6e3004622ee97eda80e4b diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index 58a62cb4..38124582 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -324,7 +324,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, /* Is it already in the open list? If so, fail. */ if (tdb_already_open(st.st_dev, st.st_ino)) { /* FIXME */ - tdb_logerr(tdb, TDB_ERR_NESTING, TDB_LOG_USE_ERROR, + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_USE_ERROR, "tdb_open: %s (%d,%d) is already open in this" " process", name, (int)st.st_dev, (int)st.st_ino); @@ -374,9 +374,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, case TDB_ERR_EINVAL: saved_errno = EINVAL; break; - case TDB_ERR_NESTING: - saved_errno = EBUSY; - break; default: saved_errno = EINVAL; break; @@ -702,7 +699,6 @@ const char *tdb_errorstr(const struct tdb_context *tdb) case TDB_ERR_LOCK: return "Locking error"; case TDB_ERR_OOM: return "Out of memory"; case TDB_ERR_EXISTS: return "Record exists"; - case TDB_ERR_NESTING: return "Transaction already started"; case TDB_ERR_EINVAL: return "Invalid parameter"; case TDB_ERR_NOEXIST: return "Record does not exist"; case TDB_ERR_RDONLY: return "write not permitted";