picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup for cddf148028 

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!!!!!!
This commit is contained in:
Harald Hoyer 2013-04-17 18:58:06 +02:00
parent 9e6d4c613d
commit c4073a27c5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/sd-journal.c
View File

@ -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) {

2
src/readahead/readahead-collect.c
View File

@ -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) {

4
src/shared/util.c
View File

@ -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) {