Work around architectures having statfs.f_type defined as long

Having RAMFS_MAGIC defined as 0x858458f6 causing problems when trying
to compare it directly against statfs.f_type being cast from long to
unsigned long.

This hack is extremly ugly, but it should at least do the right thing
for every situation.

Thanks to Arnd Bergmann for suggesting the fix.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/util.c b/util.c
index e32d97a011e7a791870f1015830a363e19167a0e..afb2bb110f24cf65c4cdd23bed3f23dc2db0c884 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1946,9 +1946,13 @@ int in_initrd(void)
 {
        /* This is based on similar function in systemd. */
        struct statfs s;
+       /* statfs.f_type is signed long on s390x and MIPS, causing all
+          sorts of sign extension problems with RAMFS_MAGIC being
+          defined as 0x858458f6 */
        return  statfs("/", &s) >= 0 &&
                ((unsigned long)s.f_type == TMPFS_MAGIC ||
-                (unsigned long)s.f_type == RAMFS_MAGIC);
+                ((unsigned long)s.f_type & 0xFFFFFFFFUL) ==
+                ((unsigned long)RAMFS_MAGIC & 0xFFFFFFFFUL));
 }
 
 void reopen_mddev(int mdfd)