diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-18 14:50:42 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-18 15:01:55 +0200 |
| commit | 4826f0b7b5c0aefa08b8cc7ef64d69027f84da2c (patch) | |
| tree | cda862e85d9e0257088143ed7355452c43849872 /src/journal | |
| parent | a858b64dddf79177e12ed30f5e8c47a1471c8bfe (diff) | |
Revert f_type fixups
This reverts commit a858b64dddf79177e12ed30f5e8c47a1471c8bfe.
This reverts commit aea275c43194b6ac519ef907b62c5c995050fde0.
This reverts commit fc6e6d245ee3989c222a2a8cc82a33475f9922f3.
This reverts commit c4073a27c555aeceac87a3b02a83141cde641a1e.
This reverts commit cddf148028f525be8176e7f1cbbf4f862bd287f6.
This reverts commit 8c68a70170b31f93c287f29fd06c6c17edaf19ad.
The constants are now casted to __SWORD_TYPE, which should resolve the
compiler warnings about signed vs unsigned.
After talking to Kay, we concluded:
This should be fixed in the kernel, not worked around in userspace tools.
Architectures cannot use int and expect magic constants lager than INT_MAX
to work correctly. The kernel header needs to be fixed.
Even coreutils cannot handle it:
#define RAMFS_MAGIC 0x858458f6
# stat -f -c%t /
ffffffff858458f6
#define BTRFS_SUPER_MAGIC 0x9123683E
# stat -f -c%t /mnt
ffffffff9123683e
Although I found the perfect working macro to fix the thing :)
__extension__ ({ \
bool _ret = false; \
switch(f) { case c: _ret=true; }; \
( _ret ); \
})
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/sd-journal.c | 10 |
1 files changed, 5 insertions, 5 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) { |