Fix a bunch of problems with database contention and corruption. Note:

[netatalk.git] / libatalk / cnid / cnid_update.c

diff --git a/libatalk/cnid/cnid_update.c b/libatalk/cnid/cnid_update.c
index 6652b597a034ea3d5c4b258a9b2e7e72e03bb3c8..1c8c9a13de1c5f174e302b163ecc80e494474aae 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,11 +1,12 @@
 /*
- * $Id: cnid_update.c,v 1.4 2001-08-15 02:16:25 srittau Exp $
+ * $Id: cnid_update.c,v 1.8 2001-09-21 15:08:37 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef CNID_DB
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>
@@ -31,6 +32,7 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
   CNID_private *db;
   DBT key, data, altdata;
   DB_TXN *tid;
+  int rc = 0;
   
   if (!(db = CNID) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO))
     return -1;
@@ -41,16 +43,17 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
 
   /* begin a transaction */
 retry:
-  if ((errno = txn_begin(db->dbenv, NULL, &tid, 0))) {
-    return errno;
+  if ((rc = txn_begin(db->dbenv, NULL, &tid, 0))) {
+       syslog(LOG_ERR, "cnid_update: txn_begin failed with: %d", rc);
+    return rc;
   }
 
   /* get the old info */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == EAGAIN)
+    if (rc == DB_LOCK_DEADLOCK)
       goto retry;
     goto update_err;
   }
@@ -58,14 +61,14 @@ retry:
   /* delete the old dev/ino mapping */
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
-  if ((errno = db->db_devino->del(db->db_devino, tid, &key, 0))) {
-    if (errno == EAGAIN) {
+  if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
@@ -74,14 +77,14 @@ retry:
   /* delete the old did/name mapping */
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->del(db->db_didname, tid, &key, 0))) {
-    if (errno == EAGAIN) {
+  if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
@@ -99,9 +102,9 @@ retry:
   key.size = CNID_DEVINO_LEN;
   altdata.data = (cnid_t *) &id;
   altdata.size = sizeof(id);
-  if ((errno = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == EAGAIN) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -110,9 +113,9 @@ retry:
   /* put a new did/name mapping in */
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == EAGAIN) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -121,9 +124,9 @@ retry:
   /* update the old CNID with the new info */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == EAGAIN) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -136,3 +139,4 @@ update_err:
   syslog(LOG_ERR, "cnid_update: can't update CNID(%x)", id);
   return -1;
 }
+#endif /* CNID_DB */