aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/rgrp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index c0abe698af82..34691d75819a 100644
--- 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)
153{ 153{
154 u64 tmp; 154 u64 tmp;
155 static const u64 search[] = { 155 static const u64 search[] = {
156 [0] = 0xffffffffffffffff, 156 [0] = 0xffffffffffffffffULL,
157 [1] = 0xaaaaaaaaaaaaaaaa, 157 [1] = 0xaaaaaaaaaaaaaaaaULL,
158 [2] = 0x5555555555555555, 158 [2] = 0x5555555555555555ULL,
159 [3] = 0x0000000000000000, 159 [3] = 0x0000000000000000ULL,
160 }; 160 };
161 tmp = le64_to_cpu(*ptr) ^ search[state]; 161 tmp = le64_to_cpu(*ptr) ^ search[state];
162 tmp &= (tmp >> 1); 162 tmp &= (tmp >> 1);
@@ -191,7 +191,7 @@ u32 gfs2_bitfit(const u8 *buf, const unsigned int len, u32 goal, u8 state)
191 const __le64 *ptr = ((__le64 *)buf) + (goal >> 5); 191 const __le64 *ptr = ((__le64 *)buf) + (goal >> 5);
192 const __le64 *end = (__le64 *)(buf + ALIGN(len, sizeof(u64))); 192 const __le64 *end = (__le64 *)(buf + ALIGN(len, sizeof(u64)));
193 u64 tmp; 193 u64 tmp;
194 u64 mask = 0x5555555555555555; 194 u64 mask = 0x5555555555555555ULL;
195 u32 bit; 195 u32 bit;
196 196
197 BUG_ON(state > 3); 197 BUG_ON(state > 3);
@@ -201,7 +201,7 @@ u32 gfs2_bitfit(const u8 *buf, const unsigned int len, u32 goal, u8 state)
201 tmp = gfs2_bit_search(ptr, mask, state); 201 tmp = gfs2_bit_search(ptr, mask, state);
202 ptr++; 202 ptr++;
203 while(tmp == 0 && ptr < end) { 203 while(tmp == 0 && ptr < end) {
204 tmp = gfs2_bit_search(ptr, 0x5555555555555555, state); 204 tmp = gfs2_bit_search(ptr, 0x5555555555555555ULL, state);
205 ptr++; 205 ptr++;
206 } 206 }
207 /* Mask off any bits which are more than len bytes from the start */ 207 /* Mask off any bits which are more than len bytes from the start */