summaryrefslogtreecommitdiff
path: root/src/journal/sd-journal.c
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-17 18:58:06 +0200
committerHarald Hoyer <harald@redhat.com>2013-04-17 19:00:50 +0200
commitc4073a27c555aeceac87a3b02a83141cde641a1e (patch)
treef30b47604306eae4a6fa5ec11d84fdcef697aa7d /src/journal/sd-journal.c
parent9e6d4c613d14ee98ff1d7c88b2084697a40815fc (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!!!!!!
Diffstat (limited to 'src/journal/sd-journal.c')
-rw-r--r--src/journal/sd-journal.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 6d0f363faf..88777cbcb9 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) {