[dm-devel] [PATCH] dm log: Use ULL suffix for 64-bit constants

Geert Uytterhoeven geert at linux-m68k.org
Sat Apr 18 22:07:30 UTC 2015


On 32-bit:

drivers/md/dm-log-writes.c: In function ‘log_super’:
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type
drivers/md/dm-log-writes.c:323: warning: integer constant is too large for ‘long’ type

Add a ULL suffix to WRITE_LOG_MAGIC to fix this.
Also add a ULL suffix to WRITE_LOG_VERSION as it's stored in a __le64
field.

Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
 drivers/md/dm-log-writes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index 93e08446a87d06ff..ad1b049ae2ab80a9 100644
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -55,8 +55,8 @@
 #define LOG_DISCARD_FLAG (1 << 2)
 #define LOG_MARK_FLAG (1 << 3)
 
-#define WRITE_LOG_VERSION 1
-#define WRITE_LOG_MAGIC 0x6a736677736872
+#define WRITE_LOG_VERSION 1ULL
+#define WRITE_LOG_MAGIC 0x6a736677736872ULL
 
 /*
  * The disk format for this is braindead simple.
-- 
1.9.1




More information about the dm-devel mailing list