X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap_r%2Frdwr.c;h=85da7de0258824de59c92ac4554a4509c12fe341;hb=f84c43a43be094d89e534184fddf61010a4d61f6;hp=74cf915197cd2991dcf19f13633afcdd8b463b66;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap

diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap_r/rdwr.c
index 74cf915197..85da7de025 100644
--- a/libraries/libldap_r/rdwr.c
+++ b/libraries/libldap_r/rdwr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
 ** This is an improved implementation of Reader/Writer locks does
 ** not protect writers from starvation.  That is, if a writer is
@@ -52,7 +53,7 @@ ldap_pvt_thread_rdwr_destroy( ldap_pvt_thread_rdwr_t *rw )
 	ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
 	/* active threads? */
-	if( rw->ltrw_r_active > 0 || rw->ltrw_w_active > 1) {
+	if( rw->ltrw_r_active > 0 || rw->ltrw_w_active > 0) {
 		ldap_pvt_thread_mutex_unlock( &rw->ltrw_mutex );
 		return LDAP_PVT_THREAD_EBUSY;
 	}
@@ -84,7 +85,7 @@ int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
 
 	ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
-	if( rw->ltrw_w_active > 1 ) {
+	if( rw->ltrw_w_active > 0 ) {
 		/* writer is active */
 
 		rw->ltrw_r_wait++;
@@ -92,7 +93,7 @@ int ldap_pvt_thread_rdwr_rlock( ldap_pvt_thread_rdwr_t *rw )
 		do {
 			ldap_pvt_thread_cond_wait(
 				&rw->ltrw_read, &rw->ltrw_mutex );
-		} while( rw->ltrw_w_active > 1 );
+		} while( rw->ltrw_w_active > 0 );
 
 		rw->ltrw_r_wait--;
 	}
@@ -114,7 +115,7 @@ int ldap_pvt_thread_rdwr_rtrylock( ldap_pvt_thread_rdwr_t *rw )
 
 	ldap_pvt_thread_mutex_lock( &rw->ltrw_mutex );
 
-	if( rw->ltrw_w_active > 1) {
+	if( rw->ltrw_w_active > 0) {
 		ldap_pvt_thread_mutex_unlock( &rw->ltrw_mutex );
 		return LDAP_PVT_THREAD_EBUSY;
 	}