Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / gfs2 / rgrp.c

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index c0abe698af8206e07683db421d6f1aeb4d7fa0a2..f03d024038ea2974ffc43ba50daead1fd922bd82 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -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);
@@ -185,13 +185,14 @@ static inline u64 gfs2_bit_search(const __le64 *ptr, u64 mask, u8 state)
  * Return: the block number (bitmap buffer scope) that was found
  */
 
-u32 gfs2_bitfit(const u8 *buf, const unsigned int len, u32 goal, u8 state)
+static u32 gfs2_bitfit(const u8 *buf, const unsigned int len,
+                      u32 goal, u8 state)
 {
        u32 spoint = (goal << 1) & ((8*sizeof(u64)) - 1);
        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 +202,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 */