Commit 0e5b8e45 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: convert bmap extent type 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 79539c7c

fs/xfs/libxfs/xfs_bmap.c

+7 −7
Original line number Diff line number Diff line
@@ -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);
@@ -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));
@@ -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);
@@ -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;

fs/xfs/libxfs/xfs_bmap.h

+11 −11
Original line number Diff line number Diff line
@@ -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" }, \
@@ -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: