Skip to content

Commit 3402d93

Browse files
dgchinnerdchinner
authored andcommitted
xfs: convert da btree operations flags to unsigned.
5.18 w/ std=gnu11 compiled with gcc-5 wants flags stored in unsigned fields to be unsigned. 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 581b448 commit 3402d93

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

fs/xfs/libxfs/xfs_da_btree.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ typedef struct xfs_da_args {
7676
xfs_dablk_t rmtblkno2; /* remote attr value starting blkno */
7777
int rmtblkcnt2; /* remote attr value block count */
7878
int rmtvaluelen2; /* remote attr value length in bytes */
79-
int op_flags; /* operation flags */
79+
uint32_t op_flags; /* operation flags */
8080
enum xfs_dacmp cmpresult; /* name compare result for lookups */
8181
} xfs_da_args_t;
8282

8383
/*
8484
* Operation flags:
8585
*/
86-
#define XFS_DA_OP_JUSTCHECK 0x0001 /* check for ok with no space */
87-
#define XFS_DA_OP_RENAME 0x0002 /* this is an atomic rename op */
88-
#define XFS_DA_OP_ADDNAME 0x0004 /* this is an add operation */
89-
#define XFS_DA_OP_OKNOENT 0x0008 /* lookup/add op, ENOENT ok, else die */
90-
#define XFS_DA_OP_CILOOKUP 0x0010 /* lookup to return CI name if found */
91-
#define XFS_DA_OP_NOTIME 0x0020 /* don't update inode timestamps */
86+
#define XFS_DA_OP_JUSTCHECK (1u << 0) /* check for ok with no space */
87+
#define XFS_DA_OP_RENAME (1u << 1) /* this is an atomic rename op */
88+
#define XFS_DA_OP_ADDNAME (1u << 2) /* this is an add operation */
89+
#define XFS_DA_OP_OKNOENT (1u << 3) /* lookup op, ENOENT ok, else die */
90+
#define XFS_DA_OP_CILOOKUP (1u << 4) /* lookup returns CI name if found */
91+
#define XFS_DA_OP_NOTIME (1u << 5) /* don't update inode timestamps */
9292

9393
#define XFS_DA_OP_FLAGS \
9494
{ XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \
@@ -197,7 +197,7 @@ int xfs_da3_node_read_mapped(struct xfs_trans *tp, struct xfs_inode *dp,
197197
* Utility routines.
198198
*/
199199

200-
#define XFS_DABUF_MAP_HOLE_OK (1 << 0)
200+
#define XFS_DABUF_MAP_HOLE_OK (1u << 0)
201201

202202
int xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno);
203203
int xfs_da_grow_inode_int(struct xfs_da_args *args, xfs_fileoff_t *bno,

fs/xfs/xfs_trace.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ DECLARE_EVENT_CLASS(xfs_da_class,
19241924
__field(int, namelen)
19251925
__field(xfs_dahash_t, hashval)
19261926
__field(xfs_ino_t, inumber)
1927-
__field(int, op_flags)
1927+
__field(uint32_t, op_flags)
19281928
),
19291929
TP_fast_assign(
19301930
__entry->dev = VFS_I(args->dp)->i_sb->s_dev;
@@ -1990,7 +1990,7 @@ DECLARE_EVENT_CLASS(xfs_attr_class,
19901990
__field(xfs_dahash_t, hashval)
19911991
__field(unsigned int, attr_filter)
19921992
__field(unsigned int, attr_flags)
1993-
__field(int, op_flags)
1993+
__field(uint32_t, op_flags)
19941994
),
19951995
TP_fast_assign(
19961996
__entry->dev = VFS_I(args->dp)->i_sb->s_dev;
@@ -2097,7 +2097,7 @@ DECLARE_EVENT_CLASS(xfs_dir2_space_class,
20972097
TP_STRUCT__entry(
20982098
__field(dev_t, dev)
20992099
__field(xfs_ino_t, ino)
2100-
__field(int, op_flags)
2100+
__field(uint32_t, op_flags)
21012101
__field(int, idx)
21022102
),
21032103
TP_fast_assign(
@@ -2128,7 +2128,7 @@ TRACE_EVENT(xfs_dir2_leafn_moveents,
21282128
TP_STRUCT__entry(
21292129
__field(dev_t, dev)
21302130
__field(xfs_ino_t, ino)
2131-
__field(int, op_flags)
2131+
__field(uint32_t, op_flags)
21322132
__field(int, src_idx)
21332133
__field(int, dst_idx)
21342134
__field(int, count)

0 commit comments

Comments
 (0)