commit 1b020389de2fef258645b1916803b4a11326eddf
author Nick Kralevich <nnk@google.com> Tue May 19 22:12:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 19 22:12:53 2015 +0000
tree cb021e84a9a679620564b16da42c50ed01b9dc3f
parent fa402c9ee8e8912e3edce958d1c304c32e891a7e
parent fade9a908cd8140e6eff5be473daa04672b87343

am fe5b2513: Merge "klog: don\'t unconditionally call mknod()"

* commit 'fe5b25132937963c8d9aef532bb0bb53bc0cea1f':
  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);