GFS2: fix sparse warnings: constant is so big it is ...
authorHannes Eder <hannes@hanneseder.net>
Sat, 21 Feb 2009 01:11:42 +0000 (02:11 +0100)
committerSteven Whitehouse <steve@dolmen.chygwyn.com>
Tue, 24 Mar 2009 11:21:24 +0000 (11:21 +0000)
Fix this sparse warnings:
  fs/gfs2/rgrp.c:156:23: warning: constant 0xffffffffffffffff is so big it is unsigned long long
  fs/gfs2/rgrp.c:157:23: warning: constant 0xaaaaaaaaaaaaaaaa is so big it is unsigned long long
  fs/gfs2/rgrp.c:158:23: warning: constant 0x5555555555555555 is so big it is long long
  fs/gfs2/rgrp.c:194:20: warning: constant 0x5555555555555555 is so big it is long long
  fs/gfs2/rgrp.c:204:44: warning: constant 0x5555555555555555 is so big it is long long

Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/gfs2/rgrp.c

index c0abe698af8206e07683db421d6f1aeb4d7fa0a2..34691d75819ae65ba26bdd84380686ba9d42e812 100644 (file)
@@ -153,10 +153,10 @@ static inline u64 gfs2_bit_search(const __le64 *ptr, u64 mask, u8 state)
 {
        u64 tmp;
        static const u64 search[] = {
-               [0] = 0xffffffffffffffff,
-               [1] = 0xaaaaaaaaaaaaaaaa,
-               [2] = 0x5555555555555555,
-               [3] = 0x0000000000000000,
+               [0] = 0xffffffffffffffffULL,
+               [1] = 0xaaaaaaaaaaaaaaaaULL,
+               [2] = 0x5555555555555555ULL,
+               [3] = 0x0000000000000000ULL,
        };
        tmp = le64_to_cpu(*ptr) ^ search[state];
        tmp &= (tmp >> 1);
@@ -191,7 +191,7 @@ u32 gfs2_bitfit(const u8 *buf, const unsigned int len, u32 goal, u8 state)
        const __le64 *ptr = ((__le64 *)buf) + (goal >> 5);
        const __le64 *end = (__le64 *)(buf + ALIGN(len, sizeof(u64)));
        u64 tmp;
-       u64 mask = 0x5555555555555555;
+       u64 mask = 0x5555555555555555ULL;
        u32 bit;
 
        BUG_ON(state > 3);
@@ -201,7 +201,7 @@ u32 gfs2_bitfit(const u8 *buf, const unsigned int len, u32 goal, u8 state)
        tmp = gfs2_bit_search(ptr, mask, state);
        ptr++;
        while(tmp == 0 && ptr < end) {
-               tmp = gfs2_bit_search(ptr, 0x5555555555555555, state);
+               tmp = gfs2_bit_search(ptr, 0x5555555555555555ULL, state);
                ptr++;
        }
        /* Mask off any bits which are more than len bytes from the start */