diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | nscd/aicache.c | 2 | ||||
| -rw-r--r-- | nscd/grpcache.c | 6 | ||||
| -rw-r--r-- | nscd/hstcache.c | 4 | ||||
| -rw-r--r-- | nscd/initgrcache.c | 4 | ||||
| -rw-r--r-- | nscd/mem.c | 6 | ||||
| -rw-r--r-- | nscd/pwdcache.c | 6 | ||||
| -rw-r--r-- | nscd/servicescache.c | 4 |
8 files changed, 27 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 6418f866f4..dce8cbc232 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,17 +4,6 @@ * resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store 0xffff in the EDNS0 record. -2009-07-16 Petr Baudis <pasky@suse.cz> - - [BZ #10402] - * nscd/mem.c (mempool_alloc): Fix unlock missing in the else branch. - * nscd/aicache.c: Remove bogus db->lock unlock. - * nscd/grpcache.c: Likewise. - * nscd/hstcache.c: Likewise. - * nscd/initgrcache.c: Likewise. - * nscd/pwdcache.c: Likewise. - * nscd/servicescache.c: Likewise. - 2009-07-16 Ulrich Drepper <drepper@redhat.com> * nscd/cache.c (cache_add): Use atomic_compare_and_exchange_bool_rel diff --git a/nscd/aicache.c b/nscd/aicache.c index 8dac48e5c2..524c0a63af 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 fc2008449e..184d53898c 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 77ffcdf880..51e2273960 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 f8d4742d16..c33aaf315f 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 80ea951146..fcea6dbd03 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 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]; diff --git a/nscd/servicescache.c b/nscd/servicescache.c index c965c972a3..dc98d3005a 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); } } |