diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-17 18:58:06 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-17 19:00:50 +0200 |
| commit | c4073a27c555aeceac87a3b02a83141cde641a1e (patch) | |
| tree | f30b47604306eae4a6fa5ec11d84fdcef697aa7d | |
| parent | 9e6d4c613d14ee98ff1d7c88b2084697a40815fc (diff) | |
fixup for cddf148028f52
Instead of making a type up, just use __SWORD_TYPE, after reading
statfs(2).
Too bad, this does not fix s390x because __SWORD_TYPE is (long int) and
the kernel uses (int) to fill in the field!!!!!!
| -rw-r--r-- | src/journal/sd-journal.c | 10 | ||||
| -rw-r--r-- | src/readahead/readahead-collect.c | 2 | ||||
| -rw-r--r-- | src/shared/util.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 6d0f363fa..88777cbcb 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 long) sfs.f_type == CIFS_MAGIC_NUMBER || - (unsigned long) sfs.f_type == CODA_SUPER_MAGIC || - (unsigned long) sfs.f_type == NCP_SUPER_MAGIC || - (unsigned long) sfs.f_type == NFS_SUPER_MAGIC || - (unsigned long) sfs.f_type == SMB_SUPER_MAGIC; + (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; } 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 735bd8e3e..fbfa8e786 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 long) sfs.f_type == BTRFS_SUPER_MAGIC; + on_btrfs = statfs(root, &sfs) >= 0 && (unsigned __SWORD_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/util.c b/src/shared/util.c index f59c19df2..386973b3f 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2779,8 +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 (unsigned long) s->f_type == TMPFS_MAGIC || - (unsigned long) s->f_type == RAMFS_MAGIC; + return (unsigned __SWORD_TYPE) s->f_type == TMPFS_MAGIC || + (unsigned __SWORD_TYPE) s->f_type == RAMFS_MAGIC; } int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) { |