From 00ebd7ed58df389a78e41dece058048725cb585e Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 17 Jul 2009 07:49:16 -0700
Subject: Revert "Fix lock handling in memory hander of nscd."

This reverts commit 137028b4d7e50f71906c1656c27079eac5a1d085.

Conflicts:

	ChangeLog
---
 nscd/pwdcache.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nscd/pwdcache.c')

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index fc5b44eef0..2338e7e1e0 100644
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -153,6 +153,8 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
 	      (void) cache_add (req->type, key_copy, req->key_len,
 				&dataset->head, true, db, owner, he == NULL);
 
+	      pthread_rwlock_unlock (&db->lock);
+
 	      /* Mark the old entry as obsolete.  */
 	      if (dh != NULL)
 		dh->usable = false;
@@ -360,10 +362,12 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
 		(void) cache_add (GETPWBYUID, cp, key_offset, &dataset->head,
 				  false, db, owner, false);
 	    }
+
+	out:
+	  pthread_rwlock_unlock (&db->lock);
 	}
     }
 
-out:
   if (__builtin_expect (written != total, 0) && debug_level > 0)
     {
       char buf[256];
-- 
cgit v1.2.3