* nscd/connections.c (handle_request): Using sendfile always
	requires that mmap is used for the database.
	Patch by Petr Baudis <pasky@suse.cz>.
This commit is contained in:
Ulrich Drepper 2007-08-22 03:40:34 +00:00
parent c44d3bdf14
commit 1465dd0f9e
2 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,10 @@
2007-08-21 Ulrich Drepper <drepper@redhat.com>
[BZ #4946]
* nscd/connections.c (handle_request): Using sendfile always
requires that mmap is used for the database.
Patch by Petr Baudis <pasky@suse.cz>.
[BZ #4905]
* nscd/hstcache.c (cache_addhst): When reloading an entry which
suddenly has two or more addresses, ignore it and remove the old

View File

@ -1016,7 +1016,7 @@ cannot handle old request version %d; current version is %d"),
ssize_t nwritten;
#ifdef HAVE_SENDFILE
if (db->mmap_used || !cached->notfound)
if (__builtin_expect (db->mmap_used, 1))
{
assert (db->wr_fd != -1);
assert ((char *) cached->data > (char *) db->data);