Skip to contentSkip to conversation

ocfs2: fix -Wformat warnings when building UML on x86-64

PATCH New Jeff Mahoney 3 participants 3 messages Feb 21, 2006 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/14 ocfs2: fix -Wformat warnings when building UML on x86-64

The check to determine which format string is appopriate for u64 and friends works in most cases, but UML on x86_64 doesn't define CONFIG_X86_64, so it results in screen fulls of compile-time warnings.

This patch fixes it to handle that case.

 fs/ocfs2/cluster/masklog.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
fs/ocfs2/cluster/masklog.h +1 -1
diff -ruNpX ../dontdiff linux-2.6.16-rc4.ocfs2-staging1/fs/ocfs2/cluster/masklog.h linux-2.6.16-rc4.ocfs2-staging2/fs/ocfs2/cluster/masklog.h
@@ -255,7 +255,7 @@ extern struct mlog_bits mlog_and_bits, m
 	}								\
 } while (0)
 
-#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64)
+#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64) || (defined(CONFIG_UML_X86) && defined(CONFIG_64BIT))
 #define MLFi64 "lld"
 #define MLFu64 "llu"
 #define MLFx64 "llx"
#1 lore raw

PATCH 1/14 ocfs2: fix -Wformat warnings when building UML on x86-64

Quoted 16 lines · Jeff Mahoney

The check to determine which format string is appopriate for u64 and friends works in most cases, but UML on x86_64 doesn't define CONFIG_X86_64, so it results in screen fulls of compile-time warnings.

This patch fixes it to handle that case.

 fs/ocfs2/cluster/masklog.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -ruNpX ../dontdiff linux-2.6.16-rc4.ocfs2-staging1/fs/ocfs2/cluster/masklog.h linux-2.6.16-rc4.ocfs2-staging2/fs/ocfs2/cluster/masklog.h

fs/ocfs2/cluster/masklog.h extern struct mlog_bits mlog_and_bits, m · line 261

Quoted 8 lines
fs/ocfs2/cluster/masklog.h +1 -1
@@ -255,7 +255,7 @@ extern struct mlog_bits mlog_and_bits, m
 	}								\
 } while (0)
 
-#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64)
+#if (BITS_PER_LONG == 32) || defined(CONFIG_X86_64) || (defined(CONFIG_UML_X86) && defined(CONFIG_64BIT))
 #define MLFi64 "lld"
 #define MLFu64 "llu"
 #define MLFx64 "llx"

Please just rip out this crap instead and use the normal (long long) or (unsigned long long) casts used everywhere else in the kernel.

#2 lore raw

PATCH 1/14 ocfs2: fix -Wformat warnings when building UML on x86-64

Quoted 3 lines · Christoph Hellwig

Please just rip out this crap instead and use the normal (long long) or (unsigned long long) casts used everywhere else in the kernel.

Well, it helps us avoid a ton of those casts, which I guess us wacky OCFS2 folks thought were more ugly.

Unless you have a patch, I'll put removal of ML*64 on my todo list, but in the meantime lets silence things for Jeff.

	--Mark

--
Mark Fasheh
Senior Software Developer, Oracle
mark.fasheh at oracle.com