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 | 2 | ||||
| -rw-r--r-- | src/shared/util.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index e92f20b63b..bc9e41e047 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 = - 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); + 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); } 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 19703aa602..75ec5b70c7 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 && CMP_F_TYPE(sfs.f_type, BTRFS_SUPER_MAGIC); + on_btrfs = statfs(root, &sfs) >= 0 && F_TYPE_CMP(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 f91f7de769..08b40fd2b8 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -272,7 +272,7 @@ do { \ * 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) \ +#define F_TYPE_CMP(f, c) \ __extension__ ({ \ __SWORD_TYPE _f = (f); \ const __SWORD_TYPE _c = (c); \ diff --git a/src/shared/util.c b/src/shared/util.c index 2a8046922b..e8431839b0 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2780,8 +2780,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 - CMP_F_TYPE(s->f_type, TMPFS_MAGIC) || - CMP_F_TYPE(s->f_type, RAMFS_MAGIC); + F_TYPE_CMP(s->f_type, TMPFS_MAGIC) || + F_TYPE_CMP(s->f_type, RAMFS_MAGIC); } int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { |