Skip to content

Commit 722db70

Browse files
committed
xfs: convert btree buffer log flags to unsigned.
5.18 w/ std=gnu11 compiled with gcc-5 wants flags stored in unsigned fields to be unsigned. We also pass the fields to log to xfs_btree_offsets() as a uint32_t all cases now. I have no idea why we made that parameter a int64_t in the first place, but while we are fixing this up change it to a uint32_t field, too. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Chandan Babu R <chandan.babu@oracle.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
1 parent 0d1b976 commit 722db70

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

fs/xfs/libxfs/xfs_btree.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -751,20 +751,20 @@ xfs_btree_lastrec(
751751
*/
752752
void
753753
xfs_btree_offsets(
754-
int64_t fields, /* bitmask of fields */
754+
uint32_t fields, /* bitmask of fields */
755755
const short *offsets, /* table of field offsets */
756756
int nbits, /* number of bits to inspect */
757757
int *first, /* output: first byte offset */
758758
int *last) /* output: last byte offset */
759759
{
760760
int i; /* current bit number */
761-
int64_t imask; /* mask for current bit number */
761+
uint32_t imask; /* mask for current bit number */
762762

763763
ASSERT(fields != 0);
764764
/*
765765
* Find the lowest bit, so the first byte offset.
766766
*/
767-
for (i = 0, imask = 1LL; ; i++, imask <<= 1) {
767+
for (i = 0, imask = 1u; ; i++, imask <<= 1) {
768768
if (imask & fields) {
769769
*first = offsets[i];
770770
break;
@@ -773,7 +773,7 @@ xfs_btree_offsets(
773773
/*
774774
* Find the highest bit, so the last byte offset.
775775
*/
776-
for (i = nbits - 1, imask = 1LL << i; ; i--, imask >>= 1) {
776+
for (i = nbits - 1, imask = 1u << i; ; i--, imask >>= 1) {
777777
if (imask & fields) {
778778
*last = offsets[i + 1] - 1;
779779
break;
@@ -1456,7 +1456,7 @@ void
14561456
xfs_btree_log_block(
14571457
struct xfs_btree_cur *cur, /* btree cursor */
14581458
struct xfs_buf *bp, /* buffer containing btree block */
1459-
int fields) /* mask of fields: XFS_BB_... */
1459+
uint32_t fields) /* mask of fields: XFS_BB_... */
14601460
{
14611461
int first; /* first byte offset logged */
14621462
int last; /* last byte offset logged */

fs/xfs/libxfs/xfs_btree.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,19 @@ uint32_t xfs_btree_magic(int crc, xfs_btnum_t btnum);
6868
/*
6969
* For logging record fields.
7070
*/
71-
#define XFS_BB_MAGIC (1 << 0)
72-
#define XFS_BB_LEVEL (1 << 1)
73-
#define XFS_BB_NUMRECS (1 << 2)
74-
#define XFS_BB_LEFTSIB (1 << 3)
75-
#define XFS_BB_RIGHTSIB (1 << 4)
76-
#define XFS_BB_BLKNO (1 << 5)
77-
#define XFS_BB_LSN (1 << 6)
78-
#define XFS_BB_UUID (1 << 7)
79-
#define XFS_BB_OWNER (1 << 8)
71+
#define XFS_BB_MAGIC (1u << 0)
72+
#define XFS_BB_LEVEL (1u << 1)
73+
#define XFS_BB_NUMRECS (1u << 2)
74+
#define XFS_BB_LEFTSIB (1u << 3)
75+
#define XFS_BB_RIGHTSIB (1u << 4)
76+
#define XFS_BB_BLKNO (1u << 5)
77+
#define XFS_BB_LSN (1u << 6)
78+
#define XFS_BB_UUID (1u << 7)
79+
#define XFS_BB_OWNER (1u << 8)
8080
#define XFS_BB_NUM_BITS 5
81-
#define XFS_BB_ALL_BITS ((1 << XFS_BB_NUM_BITS) - 1)
81+
#define XFS_BB_ALL_BITS ((1u << XFS_BB_NUM_BITS) - 1)
8282
#define XFS_BB_NUM_BITS_CRC 9
83-
#define XFS_BB_ALL_BITS_CRC ((1 << XFS_BB_NUM_BITS_CRC) - 1)
83+
#define XFS_BB_ALL_BITS_CRC ((1u << XFS_BB_NUM_BITS_CRC) - 1)
8484

8585
/*
8686
* Generic stats interface
@@ -345,7 +345,7 @@ xfs_btree_dup_cursor(
345345
*/
346346
void
347347
xfs_btree_offsets(
348-
int64_t fields, /* bitmask of fields */
348+
uint32_t fields, /* bitmask of fields */
349349
const short *offsets,/* table of field offsets */
350350
int nbits, /* number of bits to inspect */
351351
int *first, /* output: first byte offset */
@@ -435,7 +435,7 @@ bool xfs_btree_sblock_verify_crc(struct xfs_buf *);
435435
/*
436436
* Internal btree helpers also used by xfs_bmap.c.
437437
*/
438-
void xfs_btree_log_block(struct xfs_btree_cur *, struct xfs_buf *, int);
438+
void xfs_btree_log_block(struct xfs_btree_cur *, struct xfs_buf *, uint32_t);
439439
void xfs_btree_log_recs(struct xfs_btree_cur *, struct xfs_buf *, int, int);
440440

441441
/*

0 commit comments

Comments
 (0)