aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-17 07:49:16 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-17 07:49:16 -0700
commit00ebd7ed58df389a78e41dece058048725cb585e (patch)
tree63c38fcd06fb04e19d3072e66ca97647c16a1aed /nscd
parent09f97a8fbf8be28cc489a7baa1bead17e2cbf764 (diff)
downloadglibc-00ebd7ed58df389a78e41dece058048725cb585e.zip
glibc-00ebd7ed58df389a78e41dece058048725cb585e.tar.gz
glibc-00ebd7ed58df389a78e41dece058048725cb585e.tar.bz2
Revert "Fix lock handling in memory hander of nscd."
This reverts commit 137028b4d7e50f71906c1656c27079eac5a1d085. Conflicts: ChangeLog
Diffstat (limited to 'nscd')
-rw-r--r--nscd/aicache.c2
-rw-r--r--nscd/grpcache.c6
-rw-r--r--nscd/hstcache.c4
-rw-r--r--nscd/initgrcache.c4
-rw-r--r--nscd/mem.c6
-rw-r--r--nscd/pwdcache.c6
-rw-r--r--nscd/servicescache.c4
7 files changed, 27 insertions, 5 deletions
diff --git a/nscd/aicache.c b/nscd/aicache.c
index 8dac48e..524c0a6 100644
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -543,6 +543,8 @@ next_nip:
(void) cache_add (req->type, key_copy, req->key_len, &dataset->head,
true, db, uid, he == NULL);
+ pthread_rwlock_unlock (&db->lock);
+
/* Mark the old entry as obsolete. */
if (dh != NULL)
dh->usable = false;
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index fc20084..184d538 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -146,6 +146,8 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, 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;
@@ -365,10 +367,12 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (GETGRBYGID, 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];
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 77ffcdf..51e2273 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -153,6 +153,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, 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;
@@ -402,6 +404,8 @@ cache_addhst (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);
}
}
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index f8d4742..c33aaf3 100644
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -230,6 +230,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, uid, he == NULL);
+ pthread_rwlock_unlock (&db->lock);
+
/* Mark the old entry as obsolete. */
if (dh != NULL)
dh->usable = false;
@@ -386,6 +388,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true,
db, uid, he == NULL);
+
+ pthread_rwlock_unlock (&db->lock);
}
}
diff --git a/nscd/mem.c b/nscd/mem.c
index 80ea951..fcea6db 100644
--- a/nscd/mem.c
+++ b/nscd/mem.c
@@ -566,6 +566,9 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
}
}
+ if (data_alloc)
+ pthread_rwlock_unlock (&db->lock);
+
if (! db->last_alloc_failed)
{
dbg_log (_("no more memory for database '%s'"), dbnames[db - dbs]);
@@ -588,8 +591,5 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
pthread_mutex_unlock (&db->memlock);
- if (data_alloc)
- pthread_rwlock_unlock (&db->lock);
-
return res;
}
diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index fc5b44e..2338e7e 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];
diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index c965c97..dc98d30 100644
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -136,6 +136,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, 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;
@@ -315,6 +317,8 @@ cache_addserv (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);
}
}