chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: no need for in_initrd() cache to be thread-local
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index f7335cf279770bbc0d8f243b06205d1d53c23b33..80dbf73c947d4f501503b2cc3626f28c8afff289 100644
(file)
--- 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);
_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) {
}
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) {
}
bool in_initrd(void) {
- static
__thread
int saved = -1;
+ static int saved = -1;
struct statfs s;
if (saved >= 0)
struct statfs s;
if (saved >= 0)