Merge branch 'guilt/xfs-unsigned-flags-5.18' into xfs-5.19-for-next

fs/xfs/libxfs/xfs_alloc.c

@@ -2777,7 +2777,7 @@ xfs_alloc_get_freelist(
  xfs_agblock_t bno;
  __be32 *agfl_bno;
  int error;
- int  logflags;
+ uint32_t logflags;
  struct xfs_mount *mp = tp->t_mountp;
  struct xfs_perag *pag;
 
@@ -2830,9 +2830,9 @@ xfs_alloc_get_freelist(
  */
 void
 xfs_alloc_log_agf(
- xfs_trans_t *tp, /* transaction pointer */
- struct xfs_buf *bp, /* buffer for a.g. freelist header */
- int fields) /* mask of fields to be logged (XFS_AGF_...) */
+ struct xfs_trans *tp,
+ struct xfs_buf  *bp,
+ uint32_t fields)
 {
  int first; /* first byte offset */
  int last; /* last byte offset */
@@ -2902,7 +2902,7 @@ xfs_alloc_put_freelist(
  struct xfs_perag *pag;
  __be32 *blockp;
  int error;
- int  logflags;
+ uint32_t logflags;
  __be32 *agfl_bno;
  int startoff;
 

fs/xfs/libxfs/xfs_alloc.h

@@ -121,7 +121,7 @@ void
 xfs_alloc_log_agf(
  struct xfs_trans *tp, /* transaction pointer */
  struct xfs_buf *bp, /* buffer for a.g. freelist header */
- int  fields);/* mask of fields to be logged (XFS_AGF_...) */
+ uint32_t fields);/* mask of fields to be logged (XFS_AGF_...) */
 
 /*
  * Interface for inode allocation to force the pag data to be initialized.

fs/xfs/libxfs/xfs_bmap.c

@@ -485,7 +485,7 @@ STATIC void
 xfs_bmap_validate_ret(
  xfs_fileoff_t bno,
  xfs_filblks_t len,
- int  flags,
+ uint32_t flags,
  xfs_bmbt_irec_t *mval,
  int nmap,
  int ret_nmap)
@@ -1399,7 +1399,7 @@ xfs_bmap_add_extent_delay_real(
  xfs_bmbt_irec_t r[3]; /* neighbor extent entries */
  /* left is 0, right is 1, prev is 2 */
  int rval=0; /* return value (logging flags) */
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  xfs_filblks_t da_new; /* new count del alloc blocks used */
  xfs_filblks_t da_old; /* old count del alloc blocks used */
  xfs_filblks_t temp=0; /* value for da_new calculations */
@@ -1950,7 +1950,7 @@ xfs_bmap_add_extent_unwritten_real(
  xfs_bmbt_irec_t r[3]; /* neighbor extent entries */
  /* left is 0, right is 1, prev is 2 */
  int rval=0; /* return value (logging flags) */
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  struct xfs_mount *mp = ip->i_mount;
  struct xfs_bmbt_irec old;
 
@@ -2479,7 +2479,7 @@ xfs_bmap_add_extent_hole_delay(
  xfs_filblks_t newlen=0; /* new indirect size */
  xfs_filblks_t oldlen=0; /* old indirect size */
  xfs_bmbt_irec_t right; /* right neighbor extent entry */
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  xfs_filblks_t temp; /* temp for indirect calculations */
 
  ifp = XFS_IFORK_PTR(ip, whichfork);
@@ -2616,7 +2616,7 @@ xfs_bmap_add_extent_hole_real(
  struct xfs_btree_cur **curp,
  struct xfs_bmbt_irec *new,
  int *logflagsp,
- int  flags)
+ uint32_t flags)
 {
  struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, whichfork);
  struct xfs_mount *mp = ip->i_mount;
@@ -2626,7 +2626,7 @@ xfs_bmap_add_extent_hole_real(
  xfs_bmbt_irec_t left; /* left neighbor extent entry */
  xfs_bmbt_irec_t right; /* right neighbor extent entry */
  int rval=0; /* return value (logging flags) */
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  struct xfs_bmbt_irec old;
 
  ASSERT(!isnullstartblock(new->br_startblock));
@@ -3766,7 +3766,7 @@ xfs_bmapi_trim_map(
  xfs_fileoff_t obno,
  xfs_fileoff_t end,
  int n,
- int  flags)
+ uint32_t flags)
 {
  if ((flags & XFS_BMAPI_ENTIRE) ||
  got->br_startoff + got->br_blockcount <= obno) {
@@ -3811,7 +3811,7 @@ xfs_bmapi_update_map(
  xfs_fileoff_t obno,
  xfs_fileoff_t end,
  int *n,
- int  flags)
+ uint32_t flags)
 {
  xfs_bmbt_irec_t *mval = *map;
 
@@ -3864,7 +3864,7 @@ xfs_bmapi_read(
  xfs_filblks_t len,
  struct xfs_bmbt_irec *mval,
  int *nmap,
- int  flags)
+ uint32_t flags)
 {
  struct xfs_mount *mp = ip->i_mount;
  int whichfork = xfs_bmapi_whichfork(flags);
@@ -4184,7 +4184,7 @@ xfs_bmapi_convert_unwritten(
  struct xfs_bmalloca *bma,
  struct xfs_bmbt_irec *mval,
  xfs_filblks_t len,
- int  flags)
+ uint32_t flags)
 {
  int whichfork = xfs_bmapi_whichfork(flags);
  struct xfs_ifork *ifp = XFS_IFORK_PTR(bma->ip, whichfork);
@@ -4312,7 +4312,7 @@ xfs_bmapi_write(
  struct xfs_inode *ip, /* incore inode */
  xfs_fileoff_t bno, /* starting file offs. mapped */
  xfs_filblks_t len, /* length to map in file */
- int  flags, /* XFS_BMAPI_... */
+ uint32_t flags, /* XFS_BMAPI_... */
  xfs_extlen_t total, /* total blocks needed */
  struct xfs_bmbt_irec *mval, /* output: map values */
  int *nmap) /* i/o: mval size/count */
@@ -4629,7 +4629,7 @@ xfs_bmapi_remap(
  xfs_fileoff_t bno,
  xfs_filblks_t len,
  xfs_fsblock_t startblock,
- int  flags)
+ uint32_t flags)
 {
  struct xfs_mount *mp = ip->i_mount;
  struct xfs_ifork *ifp;
@@ -4801,7 +4801,7 @@ xfs_bmap_del_extent_delay(
  int64_t da_old, da_new, da_diff = 0;
  xfs_fileoff_t del_endoff, got_endoff;
  xfs_filblks_t got_indlen, new_indlen, stolen;
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  int error = 0;
  bool isrt;
 
@@ -4926,7 +4926,7 @@ xfs_bmap_del_extent_cow(
  struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
  struct xfs_bmbt_irec new;
  xfs_fileoff_t del_endoff, got_endoff;
- int  state = BMAP_COWFORK;
+ uint32_t state = BMAP_COWFORK;
 
  XFS_STATS_INC(mp, xs_del_exlist);
 
@@ -4999,7 +4999,7 @@ xfs_bmap_del_extent_real(
  xfs_bmbt_irec_t *del, /* data to remove from extents */
  int *logflagsp, /* inode logging flags */
  int whichfork, /* data or attr fork */
- int  bflags) /* bmapi flags */
+ uint32_t bflags) /* bmapi flags */
 {
  xfs_fsblock_t del_endblock=0; /* first block past del */
  xfs_fileoff_t del_endoff; /* first offset past del */
@@ -5015,7 +5015,7 @@ xfs_bmap_del_extent_real(
  xfs_bmbt_irec_t new; /* new record to be inserted */
  /* REFERENCED */
  uint qfield; /* quota field to update */
- int  state = xfs_bmap_fork_to_state(whichfork);
+ uint32_t state = xfs_bmap_fork_to_state(whichfork);
  struct xfs_bmbt_irec old;
 
  mp = ip->i_mount;
@@ -5281,7 +5281,7 @@ __xfs_bunmapi(
  struct xfs_inode *ip, /* incore inode */
  xfs_fileoff_t start, /* first file offset deleted */
  xfs_filblks_t *rlen, /* i/o: amount remaining */
- int  flags, /* misc flags */
+ uint32_t flags, /* misc flags */
  xfs_extnum_t nexts) /* number of extents max */
 {
  struct xfs_btree_cur *cur; /* bmap btree cursor */
@@ -5609,7 +5609,7 @@ xfs_bunmapi(
  struct xfs_inode *ip,
  xfs_fileoff_t bno,
  xfs_filblks_t len,
- int  flags,
+ uint32_t flags,
  xfs_extnum_t nexts,
  int *done)
 {

fs/xfs/libxfs/xfs_bmap.h

@@ -39,33 +39,33 @@ struct xfs_bmalloca {
  bool aeof; /* allocated space at eof */
  bool conv; /* overwriting unwritten extents */
  int datatype;/* data type being allocated */
- int  flags;
+ uint32_t flags;
 };
 
 #define XFS_BMAP_MAX_NMAP 4
 
 /*
  * Flags for xfs_bmapi_*
  */
-#define XFS_BMAPI_ENTIRE 0x001 /* return entire extent, not trimmed */
-#define XFS_BMAPI_METADATA 0x002 /* mapping metadata not user data */
-#define XFS_BMAPI_ATTRFORK 0x004 /* use attribute fork not data */
-#define XFS_BMAPI_PREALLOC 0x008 /* preallocation op: unwritten space */
-#define XFS_BMAPI_CONTIG 0x020 /* must allocate only one extent */
+#define XFS_BMAPI_ENTIRE (1u << 0) /* return entire extent untrimmed */
+#define XFS_BMAPI_METADATA (1u << 1) /* mapping metadata not user data */
+#define XFS_BMAPI_ATTRFORK (1u << 2) /* use attribute fork not data */
+#define XFS_BMAPI_PREALLOC (1u << 3) /* preallocating unwritten space */
+#define XFS_BMAPI_CONTIG (1u << 4) /* must allocate only one extent */
 /*
  * unwritten extent conversion - this needs write cache flushing and no additional
  * allocation alignments. When specified with XFS_BMAPI_PREALLOC it converts
  * from written to unwritten, otherwise convert from unwritten to written.
  */
-#define XFS_BMAPI_CONVERT 0x040
+#define XFS_BMAPI_CONVERT (1u << 5)
 
 /*
  * allocate zeroed extents - this requires all newly allocated user data extents
  * to be initialised to zero. It will be ignored if XFS_BMAPI_METADATA is set.
  * Use in conjunction with XFS_BMAPI_CONVERT to convert unwritten extents found
  * during the allocation range to zeroed written extents.
  */
-#define XFS_BMAPI_ZERO 0x080
+#define XFS_BMAPI_ZERO (1u << 6)
 
 /*
  * Map the inode offset to the block given in ap->firstblock. Primarily
@@ -75,16 +75,16 @@ struct xfs_bmalloca {
  * For bunmapi, this flag unmaps the range without adjusting quota, reducing
  * refcount, or freeing the blocks.
  */
-#define XFS_BMAPI_REMAP 0x100
+#define XFS_BMAPI_REMAP (1u << 7)
 
 /* Map something in the CoW fork. */
-#define XFS_BMAPI_COWFORK 0x200
+#define XFS_BMAPI_COWFORK (1u << 8)
 
 /* Skip online discard of freed extents */
-#define XFS_BMAPI_NODISCARD 0x1000
+#define XFS_BMAPI_NODISCARD (1u << 9)
 
 /* Do not update the rmap btree. Used for reconstructing bmbt from rmapbt. */
-#define XFS_BMAPI_NORMAP 0x2000
+#define XFS_BMAPI_NORMAP (1u << 10)
 
 #define XFS_BMAPI_FLAGS \
  { XFS_BMAPI_ENTIRE, "ENTIRE" }, \
@@ -106,7 +106,7 @@ static inline int xfs_bmapi_aflag(int w)
  (w == XFS_COW_FORK ? XFS_BMAPI_COWFORK : 0));
 }
 
-static inline int xfs_bmapi_whichfork(int bmapi_flags)
+static inline int xfs_bmapi_whichfork(uint32_t bmapi_flags)
 {
  if (bmapi_flags & XFS_BMAPI_COWFORK)
  return XFS_COW_FORK;
@@ -124,16 +124,16 @@ static inline int xfs_bmapi_whichfork(int bmapi_flags)
 /*
  * Flags for xfs_bmap_add_extent*.
  */
-#define BMAP_LEFT_CONTIG (1 << 0)
-#define BMAP_RIGHT_CONTIG (1 << 1)
-#define BMAP_LEFT_FILLING (1 << 2)
-#define BMAP_RIGHT_FILLING (1 << 3)
-#define BMAP_LEFT_DELAY (1 << 4)
-#define BMAP_RIGHT_DELAY (1 << 5)
-#define BMAP_LEFT_VALID (1 << 6)
-#define BMAP_RIGHT_VALID (1 << 7)
-#define BMAP_ATTRFORK (1 << 8)
-#define BMAP_COWFORK (1 << 9)
+#define BMAP_LEFT_CONTIG (1u << 0)
+#define BMAP_RIGHT_CONTIG (1u << 1)
+#define BMAP_LEFT_FILLING (1u << 2)
+#define BMAP_RIGHT_FILLING (1u << 3)
+#define BMAP_LEFT_DELAY (1u << 4)
+#define BMAP_RIGHT_DELAY (1u << 5)
+#define BMAP_LEFT_VALID (1u << 6)
+#define BMAP_RIGHT_VALID (1u << 7)
+#define BMAP_ATTRFORK (1u << 8)
+#define BMAP_COWFORK (1u << 9)
 
 #define XFS_BMAP_EXT_FLAGS \
  { BMAP_LEFT_CONTIG, "LC" }, \
@@ -183,15 +183,15 @@ int xfs_bmap_last_offset(struct xfs_inode *ip, xfs_fileoff_t *unused,
  int whichfork);
 int xfs_bmapi_read(struct xfs_inode *ip, xfs_fileoff_t bno,
  xfs_filblks_t len, struct xfs_bmbt_irec *mval,
- int *nmap, int flags);
+ int *nmap, uint32_t flags);
 int xfs_bmapi_write(struct xfs_trans *tp, struct xfs_inode *ip,
- xfs_fileoff_t bno, xfs_filblks_t len, int flags,
+ xfs_fileoff_t bno, xfs_filblks_t len, uint32_t flags,
  xfs_extlen_t total, struct xfs_bmbt_irec *mval, int *nmap);
 int __xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,
- xfs_fileoff_t bno, xfs_filblks_t *rlen, int flags,
+ xfs_fileoff_t bno, xfs_filblks_t *rlen, uint32_t flags,
  xfs_extnum_t nexts);
 int xfs_bunmapi(struct xfs_trans *tp, struct xfs_inode *ip,
- xfs_fileoff_t bno, xfs_filblks_t len, int flags,
+ xfs_fileoff_t bno, xfs_filblks_t len, uint32_t flags,
  xfs_extnum_t nexts, int *done);
 int xfs_bmap_del_extent_delay(struct xfs_inode *ip, int whichfork,
  struct xfs_iext_cursor *cur, struct xfs_bmbt_irec *got,
@@ -243,7 +243,7 @@ void xfs_bmap_map_extent(struct xfs_trans *tp, struct xfs_inode *ip,
 void xfs_bmap_unmap_extent(struct xfs_trans *tp, struct xfs_inode *ip,
  struct xfs_bmbt_irec *imap);
 
-static inline int xfs_bmap_fork_to_state(int whichfork)
+static inline uint32_t xfs_bmap_fork_to_state(int whichfork)
 {
  switch (whichfork) {
  case XFS_ATTR_FORK:
@@ -260,7 +260,7 @@ xfs_failaddr_t xfs_bmap_validate_extent(struct xfs_inode *ip, int whichfork,
 
 int xfs_bmapi_remap(struct xfs_trans *tp, struct xfs_inode *ip,
  xfs_fileoff_t bno, xfs_filblks_t len, xfs_fsblock_t startblock,
- int flags);
+ uint32_t flags);
 
 extern struct kmem_cache *xfs_bmap_intent_cache;
 

fs/xfs/libxfs/xfs_btree.c

@@ -751,20 +751,20 @@ xfs_btree_lastrec(
  */
 void
 xfs_btree_offsets(
- int64_t  fields, /* bitmask of fields */
+ uint32_t fields, /* bitmask of fields */
  const short *offsets, /* table of field offsets */
  int nbits, /* number of bits to inspect */
  int *first, /* output: first byte offset */
  int *last) /* output: last byte offset */
 {
  int i; /* current bit number */
- int64_t  imask; /* mask for current bit number */
+ uint32_t imask; /* mask for current bit number */
 
  ASSERT(fields != 0);
  /*
  * Find the lowest bit, so the first byte offset.
  */
- for (i = 0, imask = 1LL; ; i++, imask <<= 1) {
+ for (i = 0, imask = 1u; ; i++, imask <<= 1) {
  if (imask & fields) {
  *first = offsets[i];
  break;
@@ -773,7 +773,7 @@ xfs_btree_offsets(
  /*
  * Find the highest bit, so the last byte offset.
  */
- for (i = nbits - 1, imask = 1LL << i; ; i--, imask >>= 1) {
+ for (i = nbits - 1, imask = 1u << i; ; i--, imask >>= 1) {
  if (imask & fields) {
  *last = offsets[i + 1] - 1;
  break;
@@ -1456,7 +1456,7 @@ void
 xfs_btree_log_block(
  struct xfs_btree_cur *cur, /* btree cursor */
  struct xfs_buf *bp, /* buffer containing btree block */
- int  fields) /* mask of fields: XFS_BB_... */
+ uint32_t fields) /* mask of fields: XFS_BB_... */
 {
  int first; /* first byte offset logged */
  int last; /* last byte offset logged */