[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2538-gbda0f03

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  bda0f03fb3fa8a7b14d4f54bee7076d691cad44f (commit)
      from  eb281532b1721ded39c39bb00c26202080dcd735 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit bda0f03fb3fa8a7b14d4f54bee7076d691cad44f
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Tue May 20 14:18:58 2008 -0700

    Convert in_transaction to a bool. Add the same fix Volker
    used for tdb_traverse() to tdb_traverse_read().
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/tdb/common/traverse.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/traverse.c b/source/lib/tdb/common/traverse.c
index 5a31742..69c81e6 100644
--- a/source/lib/tdb/common/traverse.c
+++ b/source/lib/tdb/common/traverse.c
@@ -204,18 +204,23 @@ int tdb_traverse_read(struct tdb_context *tdb,
 {
        struct tdb_traverse_lock tl = { NULL, 0, 0, F_RDLCK };
        int ret;
+       bool in_transaction = (tdb->transaction != NULL);
 
        /* we need to get a read lock on the transaction lock here to
           cope with the lock ordering semantics of solaris10 */
-       if (tdb_transaction_lock(tdb, F_RDLCK)) {
-               return -1;
+       if (!in_transaction) {
+               if (tdb_transaction_lock(tdb, F_RDLCK)) {
+                       return -1;
+               }
        }
 
        tdb->traverse_read++;
        ret = tdb_traverse_internal(tdb, fn, private_data, &tl);
        tdb->traverse_read--;
 
-       tdb_transaction_unlock(tdb);
+       if (!in_transaction) {
+               tdb_transaction_unlock(tdb);
+       }
 
        return ret;
 }
@@ -232,7 +237,7 @@ int tdb_traverse(struct tdb_context *tdb,
 {
        struct tdb_traverse_lock tl = { NULL, 0, 0, F_WRLCK };
        int ret;
-       int in_transaction = (tdb->transaction != NULL);
+       bool in_transaction = (tdb->transaction != NULL);
 
        if (tdb->read_only || tdb->traverse_read) {
                return tdb_traverse_read(tdb, fn, private_data);


-- 
Samba Shared Repository