X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-file.h;h=fa5b943e46a2f6393ba1fae0ca86449db413d312;hb=06cc69d44c8ff2b652527357f28acd4cbe77c814;hp=6b4bf0d5aed265b3f55822a3b7031e4744351aab;hpb=853bd5cc72a0d4cbdd07cc3cabc65bef333a0c71;p=elogind.git diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index 6b4bf0d5a..fa5b943e4 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -212,17 +212,14 @@ static unsigned type_to_context(int type) { return type > 0 && type < _OBJECT_TYPE_MAX ? type : 0; } -static inline int journal_file_object_keep(JournalFile *f, Object *o, uint64_t offset) { +static inline int journal_file_object_keep(JournalFile *f, Object *o, uint64_t offset, void **release_cookie) { unsigned context = type_to_context(o->object.type); uint64_t s = le64toh(o->object.size); return mmap_cache_get(f->mmap, f->fd, f->prot, context, true, - offset, s, &f->last_stat, NULL); + offset, s, &f->last_stat, NULL, release_cookie); } -static inline int journal_file_object_release(JournalFile *f, Object *o, uint64_t offset) { - unsigned context = type_to_context(o->object.type); - uint64_t s = le64toh(o->object.size); - - return mmap_cache_release(f->mmap, f->fd, f->prot, context, offset, s); +static inline int journal_file_object_release(JournalFile *f, void *release_cookie) { + return mmap_cache_release(f->mmap, f->fd, release_cookie); }