commit df3a7f7c382b7024c4306b368f57ff63d8a23c4f
author Nick Kralevich <nnk@google.com> Wed May 20 13:13:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 20 13:13:59 2015 +0000
tree bbffee9668aac6c40b9567ca3c2186c6e07f9582
parent 5a41dba23e7e76076aa553448638a944afe6e9fc
parent 31b76e3493e1963af2489ce298b4b967d6001726

am 27fe3cb6: am 7eb3abdb: klog: don\'t unconditionally call mknod()

* commit '27fe3cb63fbda593d9830b40f06d6f468b7d7b64':
  klog: don't unconditionally call mknod()

libcutils/klog.c

diff --git a/libcutils/klog.c b/libcutils/klog.c
index f574f08..710dc66 100644
--- a/libcutils/klog.c
+++ b/libcutils/klog.c
@@ -40,6 +40,11 @@
 void klog_init(void) {
     if (klog_fd >= 0) return; /* Already initialized */
 
+    klog_fd = open("/dev/kmsg", O_WRONLY | O_CLOEXEC);
+    if (klog_fd >= 0) {
+        return;
+    }
+
     static const char* name = "/dev/__kmsg__";
     if (mknod(name, S_IFCHR | 0600, (1 << 8) | 11) == 0) {
         klog_fd = open(name, O_WRONLY | O_CLOEXEC);