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 1c7a021733e32e2d8a25be6c87c76fb0c365034b..1c8c9a13de1c5f174e302b163ecc80e494474aae 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,3 +1,12 @@
+/*
+ * $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>
@@ -16,14 +25,14 @@
 /* cnid_update: takes the given cnid and updates the metadata. to
    handle the did/name data, there are a bunch of functions to get
    and set the various fields. */
-int cnid_update(void *CNID, cnid_t id, const struct stat *st, 
-               const cnid_t did, const char *name, const int len,
-               const char *info, const int infolen)
+int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
+               const cnid_t did, const char *name, const int len/*,
+               const char *info, const int infolen*/)
 {
   CNID_private *db;
   DBT key, data, altdata;
   DB_TXN *tid;
-  DB_TXNMGR *txnp;
+  int rc = 0;
   
   if (!(db = CNID) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO))
     return -1;
@@ -31,20 +40,20 @@ int cnid_update(void *CNID, cnid_t id, const struct stat *st,
   memset(&key, 0, sizeof(key));
   memset(&data, 0, sizeof(data));
   memset(&altdata, 0, sizeof(altdata));
-  txnp = db->dbenv.tx_info;
 
   /* begin a transaction */
 retry:
-  if (errno = txn_begin(txnp, NULL, &tid)) {
-    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 = &id;
+  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;
   }
@@ -52,81 +61,82 @@ 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;
     }
   }
 
   /* delete the old did/name mapping */
-  key.data = data.data + CNID_DEVINO_LEN;
+  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;
     }
   }
-  
+
   /* delete the old aliases if necessary */
 
 
   /* make a new entry */
   data.data = make_cnid_data(st, did, name, len);
   data.size = CNID_HEADER_LEN + len + 1;
-  
+
   /* put a new dev/ino mapping in */
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
-  altdata.data = &id;
+  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;
   }
-  
+
   /* put a new did/name mapping in */
-  key.data = data.data + CNID_DEVINO_LEN;
+  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;
   }
-  
+
   /* update the old CNID with the new info */
-  key.data = &id;
+  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;
   }
-  
+
   /* end transaction */
-  return txn_commit(tid);
+  return txn_commit(tid, 0);
 
 update_err:
   syslog(LOG_ERR, "cnid_update: can't update CNID(%x)", id);
   return -1;
 }
+#endif /* CNID_DB */