From 76d0f1886fdef89891d617df7e7f3fde89a38e1a Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Wed, 19 Mar 2014 14:26:02 +0100 Subject: [PATCH] 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 Signed-off-by: NeilBrown --- util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util.c b/util.c index e32d97a0..afb2bb11 100644 --- 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) -- 2.39.2