Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 836a94ad authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: fix issues that cause userspace warnings 



Some of the code shared with userspace causes compilation warnings
from things turned off in the kernel code, such as differences in
variable signedness. Fix those issues.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent c5c249b4

fs/xfs/xfs_attr_remote.c

+4 −4
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ xfs_attr_rmtval_copyout( 
	xfs_ino_t	ino,

	int		*offset,

	int		*valuelen,

	char		**dst)

	__uint8_t	**dst)

{

	char		*src = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;
@@ -286,7 +286,7 @@ xfs_attr_rmtval_copyin( 
	xfs_ino_t	ino,

	int		*offset,

	int		*valuelen,

	char		**src)

	__uint8_t	**src)

{

	char		*dst = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;
@@ -339,7 +339,7 @@ xfs_attr_rmtval_get( 
	struct xfs_mount	*mp = args->dp->i_mount;

	struct xfs_buf		*bp;

	xfs_dablk_t		lblkno = args->rmtblkno;

	char			*dst = args->value;

	__uint8_t		*dst = args->value;

	int			valuelen = args->valuelen;

	int			nmap;

	int			error;
@@ -403,7 +403,7 @@ xfs_attr_rmtval_set( 
	struct xfs_bmbt_irec	map;

	xfs_dablk_t		lblkno;

	xfs_fileoff_t		lfileoff = 0;

	char			*src = args->value;

	__uint8_t		*src = args->value;

	int			blkcnt;

	int			valuelen;

	int			nmap;

fs/xfs/xfs_bmap.c

+0 −3
Original line number Diff line number Diff line
@@ -4258,12 +4258,9 @@ __xfs_bmapi_allocate( 
	struct xfs_ifork	*ifp = XFS_IFORK_PTR(bma->ip, whichfork);

	int			tmp_logflags = 0;

	int			error;

	int			rt;



	ASSERT(bma->length > 0);



	rt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(bma->ip);



	/*

	 * For the wasdelay case, we could also just allocate the stuff asked

	 * for in this bmap call but that wouldn't be as good.

fs/xfs/xfs_da_btree.c

+3 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ xfs_da3_split( 
	struct xfs_da_intnode	*node;

	struct xfs_buf		*bp;

	int			max;

	int			action;

	int			action = 0;

	int			error;

	int			i;
@@ -2454,9 +2454,9 @@ static int 
xfs_buf_map_from_irec(

	struct xfs_mount	*mp,

	struct xfs_buf_map	**mapp,

	unsigned int		*nmaps,

	int			*nmaps,

	struct xfs_bmbt_irec	*irecs,

	unsigned int		nirecs)

	int			nirecs)

{

	struct xfs_buf_map	*map;

	int			i;

fs/xfs/xfs_dir2_node.c

+2 −0
Original line number Diff line number Diff line
@@ -313,11 +313,13 @@ xfs_dir2_free_log_header( 
	struct xfs_trans	*tp,

	struct xfs_buf		*bp)

{

#ifdef DEBUG

	xfs_dir2_free_t		*free;		/* freespace structure */



	free = bp->b_addr;

	ASSERT(free->hdr.magic == cpu_to_be32(XFS_DIR2_FREE_MAGIC) ||

	       free->hdr.magic == cpu_to_be32(XFS_DIR3_FREE_MAGIC));

#endif

	xfs_trans_log_buf(tp, bp, 0, xfs_dir3_free_hdr_size(tp->t_mountp) - 1);

}

fs/xfs/xfs_ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ xfs_imap( 
	xfs_agblock_t	cluster_agbno;	/* first block in inode cluster */

	int		error;	/* error code */

	int		offset;	/* index of inode in its buffer */

	int		offset_agbno;	/* blks from chunk start to inode */

	xfs_agblock_t	offset_agbno;	/* blks from chunk start to inode */



	ASSERT(ino != NULLFSINO);