From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Sep 2012 21:33:22 +0000 (+0200)
Subject: journal: always keep marked mmap windows around
X-Git-Tag: v191~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=e18021f7daf6940e5fa87a35e320bb50fbd3e3ef;p=elogind.git

journal: always keep marked mmap windows around
---

diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 4be3f7e96..88fe52331 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -181,7 +181,7 @@ static void context_detach_window(Context *c) {
         c->window = NULL;
         LIST_REMOVE(Context, by_window, w->contexts, c);
 
-        if (!w->contexts) {
+        if (!w->contexts && !w->keep_always) {
                 /* Not used anymore? */
                 LIST_PREPEND(Window, unused, c->cache->unused, w);
                 if (!c->cache->last_unused)
@@ -200,7 +200,7 @@ static void context_attach_window(Context *c, Window *w) {
 
         context_detach_window(c);
 
-        if (!w->contexts) {
+        if (w->in_unused) {
                 /* Used again? */
                 LIST_REMOVE(Window, unused, c->cache->unused, w);
                 if (!c->cache->last_unused)