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

Commit 32296f86 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: fix set-but-unused warnings 



The kernel compile doesn't turn on these checks by default, so it's
only when I do a kernel-user sync that I find that there are lots of
compiler warnings waiting to be fixed. Fix up these set-but-unused
warnings.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 9a2cc41c

fs/xfs/libxfs/xfs_bmap.c

+0 −2
Original line number Diff line number Diff line
@@ -5450,13 +5450,11 @@ xfs_bmse_merge( 
	struct xfs_btree_cur		*cur,

	int				*logflags)	/* output */

{

	struct xfs_ifork		*ifp;

	struct xfs_bmbt_irec		got;

	struct xfs_bmbt_irec		left;

	xfs_filblks_t			blockcount;

	int				error, i;



	ifp = XFS_IFORK_PTR(ip, whichfork);

	xfs_bmbt_get_all(gotp, &got);

	xfs_bmbt_get_all(leftp, &left);

	blockcount = left.br_blockcount + got.br_blockcount;

fs/xfs/libxfs/xfs_da_btree.c

+0 −4
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ xfs_da3_root_split( 
	struct xfs_buf		*bp;

	struct xfs_inode	*dp;

	struct xfs_trans	*tp;

	struct xfs_mount	*mp;

	struct xfs_dir2_leaf	*leaf;

	xfs_dablk_t		blkno;

	int			level;
@@ -534,7 +533,6 @@ xfs_da3_root_split( 


	dp = args->dp;

	tp = args->trans;

	mp = state->mp;

	error = xfs_da_get_buf(tp, dp, blkno, -1, &bp, args->whichfork);

	if (error)

		return error;
@@ -2342,14 +2340,12 @@ xfs_da_shrink_inode( 
	xfs_inode_t *dp;

	int done, error, w, count;

	xfs_trans_t *tp;

	xfs_mount_t *mp;



	trace_xfs_da_shrink_inode(args);



	dp = args->dp;

	w = args->whichfork;

	tp = args->trans;

	mp = dp->i_mount;

	count = args->geo->fsbcount;

	for (;;) {

		/*

fs/xfs/libxfs/xfs_dir2_block.c

+0 −8
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ xfs_dir2_block_addname( 
	int			low;		/* low index for binary srch */

	int			lowstale;	/* low stale index */

	int			mid=0;		/* midpoint for binary srch */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needlog;	/* need to log header */

	int			needscan;	/* need to rescan freespace */

	__be16			*tagp;		/* pointer to tag value */
@@ -363,7 +362,6 @@ xfs_dir2_block_addname( 


	dp = args->dp;

	tp = args->trans;

	mp = dp->i_mount;



	/* Read the (one and only) directory block into bp. */

	error = xfs_dir3_block_read(tp, dp, &bp);
@@ -618,7 +616,6 @@ xfs_dir2_block_lookup( 
	xfs_inode_t		*dp;		/* incore inode */

	int			ent;		/* entry index */

	int			error;		/* error return value */

	xfs_mount_t		*mp;		/* filesystem mount point */



	trace_xfs_dir2_block_lookup(args);
@@ -629,7 +626,6 @@ xfs_dir2_block_lookup( 
	if ((error = xfs_dir2_block_lookup_int(args, &bp, &ent)))

		return error;

	dp = args->dp;

	mp = dp->i_mount;

	hdr = bp->b_addr;

	xfs_dir3_data_check(dp, bp);

	btp = xfs_dir2_block_tail_p(args->geo, hdr);
@@ -770,7 +766,6 @@ xfs_dir2_block_removename( 
	xfs_inode_t		*dp;		/* incore inode */

	int			ent;		/* block leaf entry index */

	int			error;		/* error return value */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needlog;	/* need to log block header */

	int			needscan;	/* need to fixup bestfree */

	xfs_dir2_sf_hdr_t	sfh;		/* shortform header */
@@ -788,7 +783,6 @@ xfs_dir2_block_removename( 
	}

	dp = args->dp;

	tp = args->trans;

	mp = dp->i_mount;

	hdr = bp->b_addr;

	btp = xfs_dir2_block_tail_p(args->geo, hdr);

	blp = xfs_dir2_block_leaf_p(btp);
@@ -852,7 +846,6 @@ xfs_dir2_block_replace( 
	xfs_inode_t		*dp;		/* incore inode */

	int			ent;		/* leaf entry index */

	int			error;		/* error return value */

	xfs_mount_t		*mp;		/* filesystem mount point */



	trace_xfs_dir2_block_replace(args);
@@ -864,7 +857,6 @@ xfs_dir2_block_replace( 
		return error;

	}

	dp = args->dp;

	mp = dp->i_mount;

	hdr = bp->b_addr;

	btp = xfs_dir2_block_tail_p(args->geo, hdr);

	blp = xfs_dir2_block_leaf_p(btp);

fs/xfs/libxfs/xfs_dir2_leaf.c

+0 −10
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ xfs_dir2_block_to_leaf( 
	xfs_dir2_db_t		ldb;		/* leaf block's bno */

	xfs_dir2_leaf_t		*leaf;		/* leaf structure */

	xfs_dir2_leaf_tail_t	*ltp;		/* leaf's tail */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needlog;	/* need to log block header */

	int			needscan;	/* need to rescan bestfree */

	xfs_trans_t		*tp;		/* transaction pointer */
@@ -395,7 +394,6 @@ xfs_dir2_block_to_leaf( 
	trace_xfs_dir2_block_to_leaf(args);



	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	/*

	 * Add the leaf block to the inode.
@@ -626,7 +624,6 @@ xfs_dir2_leaf_addname( 
	int			lfloghigh;	/* high leaf logging index */

	int			lowstale;	/* index of prev stale leaf */

	xfs_dir2_leaf_tail_t	*ltp;		/* leaf tail pointer */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needbytes;	/* leaf block bytes needed */

	int			needlog;	/* need to log data header */

	int			needscan;	/* need to rescan data free */
@@ -641,7 +638,6 @@ xfs_dir2_leaf_addname( 


	dp = args->dp;

	tp = args->trans;

	mp = dp->i_mount;



	error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp);

	if (error)
@@ -1356,11 +1352,9 @@ xfs_dir2_leaf_removename( 
	xfs_dir2_leaf_t		*leaf;		/* leaf structure */

	xfs_dir2_leaf_entry_t	*lep;		/* leaf entry */

	xfs_dir2_leaf_tail_t	*ltp;		/* leaf tail structure */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needlog;	/* need to log data header */

	int			needscan;	/* need to rescan data frees */

	xfs_dir2_data_off_t	oldbest;	/* old value of best free */

	xfs_trans_t		*tp;		/* transaction pointer */

	struct xfs_dir2_data_free *bf;		/* bestfree table */

	struct xfs_dir2_leaf_entry *ents;

	struct xfs_dir3_icleaf_hdr leafhdr;
@@ -1374,8 +1368,6 @@ xfs_dir2_leaf_removename( 
		return error;

	}

	dp = args->dp;

	tp = args->trans;

	mp = dp->i_mount;

	leaf = lbp->b_addr;

	hdr = dbp->b_addr;

	xfs_dir3_data_check(dp, dbp);
@@ -1607,11 +1599,9 @@ xfs_dir2_leaf_trim_data( 
	int			error;		/* error return value */

	xfs_dir2_leaf_t		*leaf;		/* leaf structure */

	xfs_dir2_leaf_tail_t	*ltp;		/* leaf tail structure */

	xfs_mount_t		*mp;		/* filesystem mount point */

	xfs_trans_t		*tp;		/* transaction pointer */



	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	/*

	 * Read the offending data block.  We need its buffer.

fs/xfs/libxfs/xfs_dir2_node.c

+0 −12
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ xfs_dir2_leaf_to_node( 
	int			i;		/* leaf freespace index */

	xfs_dir2_leaf_t		*leaf;		/* leaf structure */

	xfs_dir2_leaf_tail_t	*ltp;		/* leaf tail structure */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			n;		/* count of live freespc ents */

	xfs_dir2_data_off_t	off;		/* freespace entry value */

	__be16			*to;		/* pointer to freespace entry */
@@ -307,7 +306,6 @@ xfs_dir2_leaf_to_node( 
	trace_xfs_dir2_leaf_to_node(args);



	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	/*

	 * Add a freespace block to the directory.
@@ -387,16 +385,12 @@ xfs_dir2_leafn_add( 
	int			lfloghigh;	/* high leaf entry logging */

	int			lfloglow;	/* low leaf entry logging */

	int			lowstale;	/* previous stale entry */

	xfs_mount_t		*mp;		/* filesystem mount point */

	xfs_trans_t		*tp;		/* transaction pointer */

	struct xfs_dir3_icleaf_hdr leafhdr;

	struct xfs_dir2_leaf_entry *ents;



	trace_xfs_dir2_leafn_add(args, index);



	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	leaf = bp->b_addr;

	dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf);

	ents = dp->d_ops->leaf_ents_p(leaf);
@@ -1170,7 +1164,6 @@ xfs_dir2_leafn_remove( 
	xfs_dir2_leaf_entry_t	*lep;		/* leaf entry */

	int			longest;	/* longest data free entry */

	int			off;		/* data block entry offset */

	xfs_mount_t		*mp;		/* filesystem mount point */

	int			needlog;	/* need to log data header */

	int			needscan;	/* need to rescan data frees */

	xfs_trans_t		*tp;		/* transaction pointer */
@@ -1182,7 +1175,6 @@ xfs_dir2_leafn_remove( 


	dp = args->dp;

	tp = args->trans;

	mp = dp->i_mount;

	leaf = bp->b_addr;

	dp->d_ops->leaf_hdr_from_disk(&leafhdr, leaf);

	ents = dp->d_ops->leaf_ents_p(leaf);
@@ -1323,7 +1315,6 @@ xfs_dir2_leafn_split( 
	xfs_da_args_t		*args;		/* operation arguments */

	xfs_dablk_t		blkno;		/* new leaf block number */

	int			error;		/* error return value */

	xfs_mount_t		*mp;		/* filesystem mount point */

	struct xfs_inode	*dp;



	/*
@@ -1331,7 +1322,6 @@ xfs_dir2_leafn_split( 
	 */

	args = state->args;

	dp = args->dp;

	mp = dp->i_mount;

	ASSERT(oldblk->magic == XFS_DIR2_LEAFN_MAGIC);

	error = xfs_da_grow_inode(args, &blkno);

	if (error) {
@@ -2231,12 +2221,10 @@ xfs_dir2_node_trim_free( 
	xfs_inode_t		*dp;		/* incore directory inode */

	int			error;		/* error return code */

	xfs_dir2_free_t		*free;		/* freespace structure */

	xfs_mount_t		*mp;		/* filesystem mount point */

	xfs_trans_t		*tp;		/* transaction pointer */

	struct xfs_dir3_icfree_hdr freehdr;



	dp = args->dp;

	mp = dp->i_mount;

	tp = args->trans;

	/*

	 * Read the freespace block.