diff options
| -rw-r--r-- | src/journal/sd-journal.c | 10 | ||||
| -rw-r--r-- | src/readahead/readahead-collect.c | 2 | ||||
| -rw-r--r-- | src/shared/macro.h | 18 | ||||
| -rw-r--r-- | src/shared/util.c | 5 |
4 files changed, 8 insertions, 27 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 064929bf18..88af68c1f1 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 = - F_TYPE_CMP(sfs.f_type, CIFS_MAGIC_NUMBER) || - F_TYPE_CMP(sfs.f_type, CODA_SUPER_MAGIC) || - F_TYPE_CMP(sfs.f_type, NCP_SUPER_MAGIC) || - F_TYPE_CMP(sfs.f_type, NFS_SUPER_MAGIC) || - F_TYPE_CMP(sfs.f_type, SMB_SUPER_MAGIC); + sfs.f_type == (__SWORD_TYPE) CIFS_MAGIC_NUMBER || + sfs.f_type == (__SWORD_TYPE) CODA_SUPER_MAGIC || + sfs.f_type == (__SWORD_TYPE) NCP_SUPER_MAGIC || + sfs.f_type == (__SWORD_TYPE) NFS_SUPER_MAGIC || + sfs.f_type == (__SWORD_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 75ec5b70c7..02ecbe56c9 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 && F_TYPE_CMP(sfs.f_type, BTRFS_SUPER_MAGIC); + on_btrfs = statfs(root, &sfs) >= 0 && sfs.f_type == (__SWORD_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 2bb72f0d16..9bf81dc3cc 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -264,24 +264,6 @@ 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 F_TYPE_CMP(f_type, magic) \ - __extension__ ({ \ - __SWORD_TYPE _f = (f_type); \ - const __SWORD_TYPE _c = (magic); \ - const int _c32 = 1 ? (magic) \ - : sizeof((int[magic]){0}); \ - (_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 1fc6c5aa1a..5d03272619 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2779,9 +2779,8 @@ 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 - F_TYPE_CMP(s->f_type, TMPFS_MAGIC) || - F_TYPE_CMP(s->f_type, RAMFS_MAGIC); + return s->f_type == (__SWORD_TYPE) TMPFS_MAGIC || + s->f_type == (__SWORD_TYPE) RAMFS_MAGIC; } int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { |