From: Vito Caputo <vcaputo@pengaru.com>
Date: Fri, 14 Jul 2017 17:24:46 +0000 (-0700)
Subject: journal: use context_attach_window() in add_mmap() (#6339)
X-Git-Tag: v235~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7884da9e44b6578e64706e1826af5fb1c25a64e;p=thirdparty%2Fsystemd.git

journal: use context_attach_window() in add_mmap() (#6339)

Instead of context_detach_window() and a manual attach of the new
window, simply call context_attach_window() which performs the
detach first if appropriate.
---

diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 5dfda73c56a..89f4a1df64c 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -503,9 +503,7 @@ 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);
         return 1;