From c02f81cccb2626a45d61c3e9eb22a7e5ec261046 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 28 Mar 2015 09:51:54 -0700 Subject: [PATCH] Always unlink /dev/__kmsg__. Whether the open succeeds or fails, we should unlink. Change-Id: Ic2f1e10dc7b6d6e459c56049da00d165bd63ba8f --- libcutils/klog.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libcutils/klog.c b/libcutils/klog.c index fad2a8b39..f574f08cd 100644 --- a/libcutils/klog.c +++ b/libcutils/klog.c @@ -40,12 +40,9 @@ void klog_set_level(int level) { void klog_init(void) { if (klog_fd >= 0) return; /* Already initialized */ - static const char *name = "/dev/__kmsg__"; + static const char* name = "/dev/__kmsg__"; if (mknod(name, S_IFCHR | 0600, (1 << 8) | 11) == 0) { klog_fd = open(name, O_WRONLY | O_CLOEXEC); - if (klog_fd == -1) { - return; - } unlink(name); } }