diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-22 03:40:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-22 03:40:34 +0000 |
| commit | 1465dd0f9eeb612ba4bc3e4067a29ea3468f5122 (patch) | |
| tree | 28e6b96dd570fd128c8e7b199773d58508b7e7c8 | |
| parent | c44d3bdf14b75389f1fea86bfb03c9c38ea40f17 (diff) | |
| download | glibc-1465dd0f9eeb612ba4bc3e4067a29ea3468f5122.tar.gz glibc-1465dd0f9eeb612ba4bc3e4067a29ea3468f5122.tar.xz glibc-1465dd0f9eeb612ba4bc3e4067a29ea3468f5122.zip | |
[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>.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nscd/connections.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 847b80aa5f..e42f82e5d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/nscd/connections.c b/nscd/connections.c index 20b676e12a..e435fa8b27 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -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); |