From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Feb 2024 09:56:09 +0000 (+0100)
Subject: journald: rebreak some comments
X-Git-Tag: v256-rc1~866^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296de3867c74ca13d491cfb084b13bb7602858a3;p=thirdparty%2Fsystemd.git

journald: rebreak some comments
---

diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 315ec0b5130..75d9082abfc 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -376,8 +376,8 @@ void server_process_native_file(
                 _cleanup_free_ char *k = NULL;
                 const char *e;
 
-                /* If this is not a sealed memfd, and the peer is unknown or
-                 * unprivileged, then verify the path. */
+                /* If this is not a sealed memfd, and the peer is unknown or unprivileged, then verify the
+                 * path. */
 
                 r = fd_get_path(fd, &k);
                 if (r < 0) {
@@ -437,8 +437,7 @@ void server_process_native_file(
                         return;
                 }
 
-                /* Refuse operating on file systems that have
-                 * mandatory locking enabled, see:
+                /* Refuse operating on file systems that have mandatory locking enabled, see:
                  *
                  * https://github.com/systemd/systemd/issues/1822
                  */
@@ -448,13 +447,10 @@ void server_process_native_file(
                         return;
                 }
 
-                /* Make the fd non-blocking. On regular files this has
-                 * the effect of bypassing mandatory locking. Of
-                 * course, this should normally not be necessary given
-                 * the check above, but let's better be safe than
-                 * sorry, after all NFS is pretty confusing regarding
-                 * file system flags, and we better don't trust it,
-                 * and so is SMB. */
+                /* Make the fd non-blocking. On regular files this has the effect of bypassing mandatory
+                 * locking. Of course, this should normally not be necessary given the check above, but let's
+                 * better be safe than sorry, after all NFS is pretty confusing regarding file system flags,
+                 * and we better don't trust it, and so is SMB. */
                 r = fd_nonblock(fd, true);
                 if (r < 0) {
                         log_ratelimit_error_errno(r, JOURNAL_LOG_RATELIMIT,
@@ -462,9 +458,8 @@ void server_process_native_file(
                         return;
                 }
 
-                /* The file is not sealed, we can't map the file here, since
-                 * clients might then truncate it and trigger a SIGBUS for
-                 * us. So let's stupidly read it. */
+                /* The file is not sealed, we can't map the file here, since clients might then truncate it
+                 * and trigger a SIGBUS for us. So let's stupidly read it. */
 
                 p = malloc(st.st_size);
                 if (!p) {