journald: output a proper error message when the journal is used on fs that doesn...

Prompted by:

https://lists.freedesktop.org/archives/systemd-devel/2019-May/042708.html

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 3e285021bdc90d47276b6d11e972a3971b07e681..c38c3e7c14f3f04a825d46741bdbb56d6bded63e 100644 (file)
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -3323,6 +3323,13 @@ int journal_file_open(
         }
 
         r = mmap_cache_get(f->mmap, f->cache_fd, f->prot, CONTEXT_HEADER, true, 0, PAGE_ALIGN(sizeof(Header)), &f->last_stat, &h, NULL);
+        if (r == -EINVAL) {
+                /* Some file systems (jffs2 or p9fs) don't support mmap() properly (or only read-only
+                 * mmap()), and return EINVAL in that case. Let's propagate that as a more recognizable error
+                 * code. */
+                r = -EAFNOSUPPORT;
+                goto fail;
+        }
         if (r < 0)
                 goto fail;
 

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 51e7dedad59fce3ff992c6cf7d9a0beb3f021b0e..414571191f8729427bec9eb558781be64899a520 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -787,6 +787,10 @@ static bool shall_try_append_again(JournalFile *f, int r) {
                 log_warning("%s: Journal file is from the future, rotating.", f->path);
                 return true;
 
+        case -EAFNOSUPPORT:
+                log_warning("%s: underlying file system does not support memory mapping or another required file system feature.", f->path);
+                return false;
+
         default:
                 return false;
         }