From: Shawn Landden <shawn@churchofgit.com>
Date: Mon, 16 Dec 2013 00:56:21 +0000 (-0800)
Subject: util: no need for in_initrd() cache to be thread-local
X-Git-Tag: v209~848
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=73020ab241866dce79b80cbebcaae537470c7086;hp=ec202eae8e84a4c99f054f771cb832046cb8769f

util: no need for in_initrd() cache to be thread-local

the process only has one working directory, and a race is
harmless
---

diff --git a/src/shared/util.c b/src/shared/util.c
index f7335cf27..80dbf73c9 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2737,9 +2737,9 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
 
 _pure_ static int is_temporary_fs(struct statfs *s) {
         assert(s);
-        return
-                F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) ||
-                F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC);
+
+        return F_TYPE_EQUAL(s->f_type, TMPFS_MAGIC) ||
+               F_TYPE_EQUAL(s->f_type, RAMFS_MAGIC);
 }
 
 int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {
@@ -5154,7 +5154,7 @@ bool is_valid_documentation_url(const char *url) {
 }
 
 bool in_initrd(void) {
-        static __thread int saved = -1;
+        static int saved = -1;
         struct statfs s;
 
         if (saved >= 0)