Commit 3402d931 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner

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: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 581b4484
...@@ -76,19 +76,19 @@ typedef struct xfs_da_args { ...@@ -76,19 +76,19 @@ typedef struct xfs_da_args {
xfs_dablk_t rmtblkno2; /* remote attr value starting blkno */ xfs_dablk_t rmtblkno2; /* remote attr value starting blkno */
int rmtblkcnt2; /* remote attr value block count */ int rmtblkcnt2; /* remote attr value block count */
int rmtvaluelen2; /* remote attr value length in bytes */ int rmtvaluelen2; /* remote attr value length in bytes */
int op_flags; /* operation flags */ uint32_t op_flags; /* operation flags */
enum xfs_dacmp cmpresult; /* name compare result for lookups */ enum xfs_dacmp cmpresult; /* name compare result for lookups */
} xfs_da_args_t; } xfs_da_args_t;
/* /*
* Operation flags: * Operation flags:
*/ */
#define XFS_DA_OP_JUSTCHECK 0x0001 /* check for ok with no space */ #define XFS_DA_OP_JUSTCHECK (1u << 0) /* check for ok with no space */
#define XFS_DA_OP_RENAME 0x0002 /* this is an atomic rename op */ #define XFS_DA_OP_RENAME (1u << 1) /* this is an atomic rename op */
#define XFS_DA_OP_ADDNAME 0x0004 /* this is an add operation */ #define XFS_DA_OP_ADDNAME (1u << 2) /* this is an add operation */
#define XFS_DA_OP_OKNOENT 0x0008 /* lookup/add op, ENOENT ok, else die */ #define XFS_DA_OP_OKNOENT (1u << 3) /* lookup op, ENOENT ok, else die */
#define XFS_DA_OP_CILOOKUP 0x0010 /* lookup to return CI name if found */ #define XFS_DA_OP_CILOOKUP (1u << 4) /* lookup returns CI name if found */
#define XFS_DA_OP_NOTIME 0x0020 /* don't update inode timestamps */ #define XFS_DA_OP_NOTIME (1u << 5) /* don't update inode timestamps */
#define XFS_DA_OP_FLAGS \ #define XFS_DA_OP_FLAGS \
{ XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \
...@@ -197,7 +197,7 @@ int xfs_da3_node_read_mapped(struct xfs_trans *tp, struct xfs_inode *dp, ...@@ -197,7 +197,7 @@ int xfs_da3_node_read_mapped(struct xfs_trans *tp, struct xfs_inode *dp,
* Utility routines. * Utility routines.
*/ */
#define XFS_DABUF_MAP_HOLE_OK (1 << 0) #define XFS_DABUF_MAP_HOLE_OK (1u << 0)
int xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno); int xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno);
int xfs_da_grow_inode_int(struct xfs_da_args *args, xfs_fileoff_t *bno, int xfs_da_grow_inode_int(struct xfs_da_args *args, xfs_fileoff_t *bno,
......
...@@ -1924,7 +1924,7 @@ DECLARE_EVENT_CLASS(xfs_da_class, ...@@ -1924,7 +1924,7 @@ DECLARE_EVENT_CLASS(xfs_da_class,
__field(int, namelen) __field(int, namelen)
__field(xfs_dahash_t, hashval) __field(xfs_dahash_t, hashval)
__field(xfs_ino_t, inumber) __field(xfs_ino_t, inumber)
__field(int, op_flags) __field(uint32_t, op_flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = VFS_I(args->dp)->i_sb->s_dev; __entry->dev = VFS_I(args->dp)->i_sb->s_dev;
...@@ -1990,7 +1990,7 @@ DECLARE_EVENT_CLASS(xfs_attr_class, ...@@ -1990,7 +1990,7 @@ DECLARE_EVENT_CLASS(xfs_attr_class,
__field(xfs_dahash_t, hashval) __field(xfs_dahash_t, hashval)
__field(unsigned int, attr_filter) __field(unsigned int, attr_filter)
__field(unsigned int, attr_flags) __field(unsigned int, attr_flags)
__field(int, op_flags) __field(uint32_t, op_flags)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = VFS_I(args->dp)->i_sb->s_dev; __entry->dev = VFS_I(args->dp)->i_sb->s_dev;
...@@ -2097,7 +2097,7 @@ DECLARE_EVENT_CLASS(xfs_dir2_space_class, ...@@ -2097,7 +2097,7 @@ DECLARE_EVENT_CLASS(xfs_dir2_space_class,
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_ino_t, ino) __field(xfs_ino_t, ino)
__field(int, op_flags) __field(uint32_t, op_flags)
__field(int, idx) __field(int, idx)
), ),
TP_fast_assign( TP_fast_assign(
...@@ -2128,7 +2128,7 @@ TRACE_EVENT(xfs_dir2_leafn_moveents, ...@@ -2128,7 +2128,7 @@ TRACE_EVENT(xfs_dir2_leafn_moveents,
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(xfs_ino_t, ino) __field(xfs_ino_t, ino)
__field(int, op_flags) __field(uint32_t, op_flags)
__field(int, src_idx) __field(int, src_idx)
__field(int, dst_idx) __field(int, dst_idx)
__field(int, count) __field(int, count)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment