summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/journal/sd-journal.c10
-rw-r--r--src/readahead/readahead-collect.c2
-rw-r--r--src/shared/macro.h17
-rw-r--r--src/shared/util.c5
4 files changed, 26 insertions, 8 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 88777cbcb9..e92f20b63b 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1248,11 +1248,11 @@ static void check_network(sd_journal *j, int fd) {
return;
j->on_network =
- (unsigned __SWORD_TYPE) sfs.f_type == CIFS_MAGIC_NUMBER ||
- (unsigned __SWORD_TYPE) sfs.f_type == CODA_SUPER_MAGIC ||
- (unsigned __SWORD_TYPE) sfs.f_type == NCP_SUPER_MAGIC ||
- (unsigned __SWORD_TYPE) sfs.f_type == NFS_SUPER_MAGIC ||
- (unsigned __SWORD_TYPE) sfs.f_type == SMB_SUPER_MAGIC;
+ CMP_F_TYPE(sfs.f_type, CIFS_MAGIC_NUMBER) ||
+ CMP_F_TYPE(sfs.f_type, CODA_SUPER_MAGIC) ||
+ CMP_F_TYPE(sfs.f_type, NCP_SUPER_MAGIC) ||
+ CMP_F_TYPE(sfs.f_type, NFS_SUPER_MAGIC) ||
+ CMP_F_TYPE(sfs.f_type, SMB_SUPER_MAGIC);
}
static int add_file(sd_journal *j, const char *prefix, const char *filename) {
diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index fbfa8e786f..19703aa602 100644
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -505,7 +505,7 @@ done:
on_ssd = fs_on_ssd(root) > 0;
log_debug("On SSD: %s", yes_no(on_ssd));
- on_btrfs = statfs(root, &sfs) >= 0 && (unsigned __SWORD_TYPE) sfs.f_type == BTRFS_SUPER_MAGIC;
+ on_btrfs = statfs(root, &sfs) >= 0 && CMP_F_TYPE(sfs.f_type, BTRFS_SUPER_MAGIC);
log_debug("On btrfs: %s", yes_no(on_btrfs));
if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) {
diff --git a/src/shared/macro.h b/src/shared/macro.h
index 9bf81dc3cc..f91f7de769 100644
--- a/src/shared/macro.h
+++ b/src/shared/macro.h
@@ -264,6 +264,23 @@ do { \
} \
} while(false)
+/* Remove this macro, when the kernel has f_type as unsigned int or long
+ * for every architecure. Currently some 64bit architecures (like s390x)
+ * have int in the kernel, but long in userspace for f_type, so glibc
+ * extends the int to long and carries over the sign. Negative numbers are
+ * caused by the 32bit magic constants in linux/magic.h stuffed into the
+ * signed int in the kernel and these negative numbers are extended to
+ * long, which cannot be simply compared to the magic constants anymore.
+ */
+#define CMP_F_TYPE(f, c) \
+ __extension__ ({ \
+ __SWORD_TYPE _f = (f); \
+ const __SWORD_TYPE _c = (c); \
+ const int _c32 = (c); \
+ (_f == _c || _f == _c32 ); \
+ })
+
+
/* Returns the number of chars needed to format variables of the
* specified type as a decimal string. Adds in extra space for a
* negative '-' prefix. */
diff --git a/src/shared/util.c b/src/shared/util.c
index 386973b3fc..2a8046922b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2779,8 +2779,9 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
static int is_temporary_fs(struct statfs *s) {
assert(s);
- return (unsigned __SWORD_TYPE) s->f_type == TMPFS_MAGIC ||
- (unsigned __SWORD_TYPE) s->f_type == RAMFS_MAGIC;
+ return
+ CMP_F_TYPE(s->f_type, TMPFS_MAGIC) ||
+ CMP_F_TYPE(s->f_type, RAMFS_MAGIC);
}
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {