valeriyvdovin / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0089-journal-fix-return-code.patch

923a60
From 185e6b251907bdf6adc63866f38722e9fb3d3715 Mon Sep 17 00:00:00 2001
923a60
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
923a60
Date: Mon, 9 Mar 2015 17:46:30 -0400
923a60
Subject: [PATCH] journal: fix return code
923a60
923a60
Introduced in fa6ac76083b8ff.
923a60
923a60
Might be related to CID #1261724, but I don't know if coverity can
923a60
recurse this deep.
923a60
923a60
(cherry picked from commit 977eaa1eae53af7f418d87fcb42f4a4d34aad739)
923a60
---
923a60
 src/journal/journal-file.c | 4 +---
923a60
 1 file changed, 1 insertion(+), 3 deletions(-)
923a60
923a60
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
923a60
index 24c49b916a..f500568fec 100644
923a60
--- a/src/journal/journal-file.c
923a60
+++ b/src/journal/journal-file.c
923a60
@@ -2652,10 +2652,8 @@ int journal_file_open(
923a60
         }
923a60
 
923a60
         r = mmap_cache_get(f->mmap, f->fd, f->prot, CONTEXT_HEADER, true, 0, PAGE_ALIGN(sizeof(Header)), &f->last_stat, &h);
923a60
-        if (r < 0) {
923a60
-                r = -errno;
923a60
+        if (r < 0)
923a60
                 goto fail;
923a60
-        }
923a60
 
923a60
         f->header = h;
923a60