diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2014-12-12 23:20:05 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2014-12-13 00:47:23 +0100 |
| commit | 7a9dabea7eabd4dd87f8774234265590d34761da (patch) | |
| tree | 37617fa6989fe23634bb550b2fbaf1a7b7f3e549 | |
| parent | 7851983162ef851d5b9ce12bd88de86fc402f88a (diff) | |
journal: push type_to_context conversion down to journal_file_move_to()
| -rw-r--r-- | src/journal/journal-file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 1d73be1a2a..82e50fcca4 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -379,7 +379,7 @@ static unsigned type_to_context(ObjectType type) { return type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX ? type : 0; } -static int journal_file_move_to(JournalFile *f, int context, bool keep_always, uint64_t offset, uint64_t size, void **ret) { +static int journal_file_move_to(JournalFile *f, ObjectType type, bool keep_always, uint64_t offset, uint64_t size, void **ret) { assert(f); assert(ret); @@ -396,7 +396,7 @@ static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u return -EADDRNOTAVAIL; } - return mmap_cache_get(f->mmap, f->fd, f->prot, context, keep_always, offset, size, &f->last_stat, ret); + return mmap_cache_get(f->mmap, f->fd, f->prot, type_to_context(type), keep_always, offset, size, &f->last_stat, ret); } static uint64_t minimum_header_size(Object *o) { @@ -430,7 +430,7 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset if (!VALID64(offset)) return -EFAULT; - r = journal_file_move_to(f, type_to_context(type), false, offset, sizeof(ObjectHeader), &t); + r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), &t); if (r < 0) return r; @@ -450,7 +450,7 @@ int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset return -EBADMSG; if (s > sizeof(ObjectHeader)) { - r = journal_file_move_to(f, type_to_context(type), false, offset, s, &t); + r = journal_file_move_to(f, type, false, offset, s, &t); if (r < 0) return r; |