From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Jul 2017 08:03:52 +0000 (+0200)
Subject: Merge pull request #6355 from vcaputo/journal_avoid_mmap_cache_get_calls
X-Git-Tag: v235~326
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddf1819bc28be6aab3ce75e34cc6174e36f421ea;p=thirdparty%2Fsystemd.git

Merge pull request #6355 from vcaputo/journal_avoid_mmap_cache_get_calls

journal: avoid unnecessary mmap_cache_get() calls
---

ddf1819bc28be6aab3ce75e34cc6174e36f421ea
diff --cc src/journal/mmap-cache.c
index 3e076f8fea3,546710cdc9f..6e60d24dcf3
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@@ -510,9 -512,14 +519,12 @@@ static int add_mmap
          if (!w)
                  goto outofmem;
  
 -        context_detach_window(c);
 -        c->window = w;
 -        LIST_PREPEND(by_window, w->contexts, c);
 +        context_attach_window(c, w);
  
          *ret = (uint8_t*) w->ptr + (offset - w->offset);
+         if (ret_size)
+                 *ret_size = w->size - (offset - w->offset);
+ 
          return 1;
  
  outofmem: