From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 15 Jul 2025 15:56:10 +0000 (+0900)
Subject: journald-kmsg: merge manager_kmsg_mode() into manager_open_dev_kmsg()
X-Git-Tag: v258-rc1~34^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63e990308f844f22291a6433337aa806ce6a1e81;p=thirdparty%2Fsystemd.git

journald-kmsg: merge manager_kmsg_mode() into manager_open_dev_kmsg()

As it is now only used by the function.
---

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 855839113b7..1e5ad5a4e15 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -386,10 +386,6 @@ static int dispatch_dev_kmsg(sd_event_source *es, int fd, uint32_t revents, void
         return manager_read_dev_kmsg(m);
 }
 
-static mode_t manager_kmsg_mode(bool read_kmsg) {
-        return O_CLOEXEC|O_NONBLOCK|O_NOCTTY|(read_kmsg ? O_RDWR : O_WRONLY);
-}
-
 int manager_open_dev_kmsg(Manager *m) {
         int r;
 
@@ -397,7 +393,7 @@ int manager_open_dev_kmsg(Manager *m) {
         assert(m->dev_kmsg_fd < 0);
         assert(!m->dev_kmsg_event_source);
 
-        mode_t mode = manager_kmsg_mode(m->config.read_kmsg);
+        mode_t mode = O_CLOEXEC|O_NONBLOCK|O_NOCTTY|(m->config.read_kmsg ? O_RDWR : O_WRONLY);
 
         _cleanup_close_ int fd = open("/dev/kmsg", mode);
         if (fd < 0) {