svn commit: samba r10465 - in branches/SAMBA_4_0/source/lib/tdb/common: .

tridge at samba.org tridge at samba.org
Sat Sep 24 03:43:03 GMT 2005


Author: tridge
Date: 2005-09-24 03:43:02 +0000 (Sat, 24 Sep 2005)
New Revision: 10465

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10465

Log:
separate out a read_only db from a read-only traversal to ensure we
don't end up doing a mmap read only

Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/io.c
   branches/SAMBA_4_0/source/lib/tdb/common/lock.c
   branches/SAMBA_4_0/source/lib/tdb/common/tdb.c
   branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
   branches/SAMBA_4_0/source/lib/tdb/common/transaction.c
   branches/SAMBA_4_0/source/lib/tdb/common/traverse.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/io.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/io.c	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/io.c	2005-09-24 03:43:02 UTC (rev 10465)
@@ -97,7 +97,7 @@
 static int tdb_write(struct tdb_context *tdb, tdb_off_t off, 
 		     const void *buf, tdb_len_t len)
 {
-	if (tdb->read_only) {
+	if (tdb->read_only || tdb->traverse_read) {
 		tdb->ecode = TDB_ERR_RDONLY;
 		return -1;
 	}
@@ -230,7 +230,7 @@
 {
 	char buf[1024];
 
-	if (tdb->read_only) {
+	if (tdb->read_only || tdb->traverse_read) {
 		tdb->ecode = TDB_ERR_RDONLY;
 		return -1;
 	}

Modified: branches/SAMBA_4_0/source/lib/tdb/common/lock.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/lock.c	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/lock.c	2005-09-24 03:43:02 UTC (rev 10465)
@@ -46,7 +46,7 @@
 		return 0;
 	}
 
-	if ((rw_type == F_WRLCK) && (tdb->read_only)) {
+	if ((rw_type == F_WRLCK) && (tdb->read_only || tdb->traverse_read)) {
 		tdb->ecode = TDB_ERR_RDONLY;
 		return -1;
 	}
@@ -161,7 +161,7 @@
 	u32 i;
 
 	/* There are no locks on read-only dbs */
-	if (tdb->read_only)
+	if (tdb->read_only || tdb->traverse_read)
 		return TDB_ERRCODE(TDB_ERR_LOCK, -1);
 	for (i = 0; i < tdb->header.hash_size; i++) 
 		if (tdb_lock(tdb, i, F_WRLCK))

Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb.c	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb.c	2005-09-24 03:43:02 UTC (rev 10465)
@@ -164,7 +164,7 @@
 	tdb_off_t last_ptr, i;
 	struct list_struct lastrec;
 
-	if (tdb->read_only) return -1;
+	if (tdb->read_only || tdb->traverse_read) return -1;
 
 	if (tdb_write_lock_record(tdb, rec_ptr) == -1) {
 		/* Someone traversing here: mark it as dead */
@@ -227,7 +227,7 @@
 	char *p = NULL;
 	int ret = 0;
 
-	if (tdb->read_only) {
+	if (tdb->read_only || tdb->traverse_read) {
 		tdb->ecode = TDB_ERR_RDONLY;
 		return -1;
 	}

Modified: branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/tdb_private.h	2005-09-24 03:43:02 UTC (rev 10465)
@@ -183,6 +183,7 @@
 	int fd; /* open file descriptor for the database */
 	tdb_len_t map_size; /* how much space has been mapped */
 	int read_only; /* opened read-only */
+	int traverse_read; /* read-only traversal */
 	struct tdb_lock_type *locked; /* array of chain locks */
 	enum TDB_ERROR ecode; /* error code for last tdb error */
 	struct tdb_header header; /* a cached copy of the header */

Modified: branches/SAMBA_4_0/source/lib/tdb/common/transaction.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/transaction.c	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/transaction.c	2005-09-24 03:43:02 UTC (rev 10465)
@@ -349,7 +349,7 @@
 int tdb_transaction_start(struct tdb_context *tdb)
 {
 	/* some sanity checks */
-	if (tdb->read_only || (tdb->flags & TDB_INTERNAL)) {
+	if (tdb->read_only || (tdb->flags & TDB_INTERNAL) || tdb->traverse_read) {
 		TDB_LOG((tdb, 0, "tdb_transaction_start: cannot start a transaction on a read-only or internal db\n"));
 		tdb->ecode = TDB_ERR_EINVAL;
 		return -1;

Modified: branches/SAMBA_4_0/source/lib/tdb/common/traverse.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2005-09-24 03:31:01 UTC (rev 10464)
+++ branches/SAMBA_4_0/source/lib/tdb/common/traverse.c	2005-09-24 03:43:02 UTC (rev 10465)
@@ -114,7 +114,7 @@
 			/* Try to clean dead ones from old traverses */
 			current = tlock->off;
 			tlock->off = rec->next;
-			if (!tdb->read_only && 
+			if (!(tdb->read_only || tdb->traverse_read) && 
 			    tdb_do_delete(tdb, current, rec) != 0)
 				goto fail;
 		}
@@ -204,10 +204,10 @@
 		      tdb_traverse_func fn, void *private)
 {
 	struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
-	int ret, read_only = tdb->read_only;
-	tdb->read_only = 1;
+	int ret;
+	tdb->traverse_read++;
 	ret = tdb_traverse_internal(tdb, fn, private, &tl);
-	tdb->read_only = read_only;
+	tdb->traverse_read--;
 	return ret;
 }
 
@@ -221,7 +221,7 @@
 	struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
 	int ret;
 
-	if (tdb->read_only) {
+	if (tdb->read_only || tdb->traverse_read) {
 		return tdb_traverse_read(tdb, fn, private);
 	}
 	



More information about the samba-cvs mailing list