[gfs2-utils] 20/27: libgfs2: Fix endianness tagging for gfs2_bit_search

This is an automated email from the git hooks/post-receive script.

andyp pushed a commit to branch andyp-sparse
in repository gfs2-utils.

commit 12a282558788405715120e7f8f5a592fa64e196c
Author: Andrew Price <anprice(a)redhat.com&gt;
AuthorDate: Thu Jun 10 18:17:07 2021 +0100

    libgfs2: Fix endianness tagging for gfs2_bit_search
    
    Signed-off-by: Andrew Price <anprice(a)redhat.com&gt;
---
 gfs2/libgfs2/fs_bits.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gfs2/libgfs2/fs_bits.c b/gfs2/libgfs2/fs_bits.c
index 72d2b006..8399e486 100644
--- a/gfs2/libgfs2/fs_bits.c
+++ b/gfs2/libgfs2/fs_bits.c
@@ -38,7 +38,7 @@
  * single test (on 64 bit arches).
  */
 
-static inline uint64_t gfs2_bit_search(const unsigned long long *ptr,
+static inline uint64_t gfs2_bit_search(const __le64 *ptr,
 				       unsigned long long mask,
 				       uint8_t state)
 {
@@ -67,13 +67,12 @@ static inline uint64_t gfs2_bit_search(const unsigned long long *ptr,
 unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int len,
 			  unsigned long goal, unsigned char state)
 {
-	unsigned long spoint = (goal << 1) & ((8 * sizeof(unsigned long long)) - 1);
-	const unsigned long long *ptr = ((unsigned long long *)buf) + (goal >> 5);
-	const unsigned long long *end = (unsigned long long *)
-		(buf + ALIGN(len, sizeof(unsigned long long)));
-	unsigned long long tmp;
-	unsigned long long mask = 0x5555555555555555ULL;
-	unsigned long bit;
+	uint32_t spoint = (goal << 1) & ((8 * sizeof(uint64_t)) - 1);
+	const __le64 *ptr = ((__le64 *)buf) + (goal >> 5);
+	const __le64 *end = (__le64 *) (buf + ALIGN(len, sizeof(uint64_t)));
+	uint64_t tmp;
+	uint64_t mask = 0x5555555555555555ULL;
+	uint32_t bit;
 
 	if (state > 3)
 		return 0;
@@ -87,9 +86,9 @@ unsigned long gfs2_bitfit(const unsigned char *buf, const unsigned int
len,
 		ptr++;
 	}
 	/* Mask off any bits which are more than len bytes from the start */
-	if (ptr == end && (len & (sizeof(unsigned long long) - 1)))
-		tmp &= (((unsigned long long)~0) >>
-			(64 - 8 * (len & (sizeof(unsigned long long) - 1))));
+	if (ptr == end && (len & (sizeof(uint64_t) - 1)))
+		tmp &= (((uint64_t)~0) >>
+			(64 - 8 * (len & (sizeof(uint64_t) - 1))));
 	/* Didn't find anything, so return */
 	if (tmp == 0)
 		return BFITNOENT;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.