From 1b8951e5bd9b2bf1722098a861055cae0bb52088 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 12 Dec 2014 21:52:18 +0100 Subject: journal: remove journal_file_object_keep/release functions The only user is sd_journal_enumerate_unique() and, as explained in the previous commit (fed67c38e3 "journal: map objects to context set by caller, not by actual object type"), the use of them there is now superfluous. Let's remove them. This reverts major parts of commits: ae97089d49 journal: fix access to munmapped memory in sd_journal_enumerate_unique 06cc69d44c sd-journal: fix sd_journal_enumerate_unique skipping values Tested with an "--enable-debug" build and "journalctl --list-boots". It gives the expected number of results. Additionally, if I then revert the previous commit ("journal: map objects to context set by caller, not to actual object type"), it crashes with SIGSEGV, as expected. --- src/journal/mmap-cache.c | 74 +++++++++++------------------------------------- 1 file changed, 16 insertions(+), 58 deletions(-) (limited to 'src/journal/mmap-cache.c') diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c index c57c1623c5..f34d260856 100644 --- a/src/journal/mmap-cache.c +++ b/src/journal/mmap-cache.c @@ -38,7 +38,7 @@ typedef struct FileDescriptor FileDescriptor; struct Window { MMapCache *cache; - unsigned keep_always; + bool keep_always; bool in_unused; int prot; @@ -191,7 +191,7 @@ static void context_detach_window(Context *c) { c->window = NULL; LIST_REMOVE(by_window, w->contexts, c); - if (!w->contexts && w->keep_always == 0) { + if (!w->contexts && !w->keep_always) { /* Not used anymore? */ #ifdef ENABLE_DEBUG_MMAP_CACHE /* Unmap unused windows immediately to expose use-after-unmap @@ -364,8 +364,7 @@ static int try_context( bool keep_always, uint64_t offset, size_t size, - void **ret, - void **release_cookie) { + void **ret) { Context *c; @@ -373,6 +372,7 @@ static int try_context( assert(m->n_ref > 0); assert(fd >= 0); assert(size > 0); + assert(ret); c = hashmap_get(m->contexts, UINT_TO_PTR(context+1)); if (!c) @@ -390,12 +390,9 @@ static int try_context( return 0; } - c->window->keep_always += keep_always; + c->window->keep_always |= keep_always; - if (ret) - *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset); - if (keep_always && release_cookie) - *release_cookie = c->window; + *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset); return 1; } @@ -407,8 +404,7 @@ static int find_mmap( bool keep_always, uint64_t offset, size_t size, - void **ret, - void **release_cookie) { + void **ret) { FileDescriptor *f; Window *w; @@ -439,10 +435,7 @@ static int find_mmap( context_attach_window(c, w); w->keep_always += keep_always; - if (ret) - *ret = (uint8_t*) w->ptr + (offset - w->offset); - if (keep_always && release_cookie) - *release_cookie = c->window; + *ret = (uint8_t*) w->ptr + (offset - w->offset); return 1; } @@ -455,8 +448,7 @@ static int add_mmap( uint64_t offset, size_t size, struct stat *st, - void **ret, - void **release_cookie) { + void **ret) { uint64_t woffset, wsize; Context *c; @@ -469,6 +461,7 @@ static int add_mmap( assert(m->n_ref > 0); assert(fd >= 0); assert(size > 0); + assert(ret); woffset = offset & ~((uint64_t) page_size() - 1ULL); wsize = size + (offset - woffset); @@ -538,10 +531,7 @@ static int add_mmap( c->window = w; LIST_PREPEND(by_window, w->contexts, c); - if (ret) - *ret = (uint8_t*) w->ptr + (offset - w->offset); - if (keep_always && release_cookie) - *release_cookie = c->window; + *ret = (uint8_t*) w->ptr + (offset - w->offset); return 1; outofmem: @@ -558,8 +548,7 @@ int mmap_cache_get( uint64_t offset, size_t size, struct stat *st, - void **ret, - void **release_cookie) { + void **ret) { int r; @@ -567,16 +556,17 @@ int mmap_cache_get( assert(m->n_ref > 0); assert(fd >= 0); assert(size > 0); + assert(ret); /* Check whether the current context is the right one already */ - r = try_context(m, fd, prot, context, keep_always, offset, size, ret, release_cookie); + r = try_context(m, fd, prot, context, keep_always, offset, size, ret); if (r != 0) { m->n_hit ++; return r; } /* Search for a matching mmap */ - r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret, release_cookie); + r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret); if (r != 0) { m->n_hit ++; return r; @@ -585,39 +575,7 @@ int mmap_cache_get( m->n_missed++; /* Create a new mmap */ - return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret, release_cookie); -} - -int mmap_cache_release( - MMapCache *m, - int fd, - void *release_cookie) { - - FileDescriptor *f; - Window *w; - - assert(m); - assert(m->n_ref > 0); - assert(fd >= 0); - - f = hashmap_get(m->fds, INT_TO_PTR(fd + 1)); - if (!f) - return -EBADF; - - assert(f->fd == fd); - - LIST_FOREACH(by_fd, w, f->windows) - if (w == release_cookie) - break; - - if (!w) - return -ENOENT; - - if (w->keep_always == 0) - return -ENOLCK; - - w->keep_always -= 1; - return 0; + return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret); } void mmap_cache_close_fd(MMapCache *m, int fd) { -- cgit v1.2.3-54-g00ecf