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

Commit 73523a2e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: fix gcc 4.6 set but not read and unused statement warnings 



[hch: dropped a few hunks that need structural changes instead]

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 0f1a932f

fs/xfs/xfs_alloc.c

+3 −7
Original line number Diff line number Diff line
@@ -683,8 +683,6 @@ xfs_alloc_ag_vextent_near( 
	xfs_agblock_t	ltbno;		/* start bno of left side entry */

	xfs_agblock_t	ltbnoa;		/* aligned ... */

	xfs_extlen_t	ltdiff;		/* difference to left side entry */

	/*REFERENCED*/

	xfs_agblock_t	ltend;		/* end bno of left side entry */

	xfs_extlen_t	ltlen;		/* length of left side entry */

	xfs_extlen_t	ltlena;		/* aligned ... */

	xfs_agblock_t	ltnew;		/* useful start bno of left side */
@@ -809,8 +807,7 @@ xfs_alloc_ag_vextent_near( 
		if ((error = xfs_alloc_get_rec(cnt_cur, &ltbno, &ltlen, &i)))

			goto error0;

		XFS_WANT_CORRUPTED_GOTO(i == 1, error0);

		ltend = ltbno + ltlen;

		ASSERT(ltend <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

		ASSERT(ltbno + ltlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

		args->len = blen;

		if (!xfs_alloc_fix_minleft(args)) {

			xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
@@ -823,7 +820,7 @@ xfs_alloc_ag_vextent_near( 
		 */

		args->agbno = bnew;

		ASSERT(bnew >= ltbno);

		ASSERT(bnew + blen <= ltend);

		ASSERT(bnew + blen <= ltbno + ltlen);

		/*

		 * Set up a cursor for the by-bno tree.

		 */
@@ -1152,7 +1149,6 @@ xfs_alloc_ag_vextent_near( 
	/*

	 * Fix up the length and compute the useful address.

	 */

	ltend = ltbno + ltlen;

	args->len = XFS_EXTLEN_MIN(ltlena, args->maxlen);

	xfs_alloc_fix_len(args);

	if (!xfs_alloc_fix_minleft(args)) {
@@ -1165,7 +1161,7 @@ xfs_alloc_ag_vextent_near( 
	(void)xfs_alloc_compute_diff(args->agbno, rlen, args->alignment, ltbno,

		ltlen, &ltnew);

	ASSERT(ltnew >= ltbno);

	ASSERT(ltnew + rlen <= ltend);

	ASSERT(ltnew + rlen <= ltbno + ltlen);

	ASSERT(ltnew + rlen <= be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

	args->agbno = ltnew;

	if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur_lt, ltbno, ltlen,

fs/xfs/xfs_da_btree.c

+2 −4
Original line number Diff line number Diff line
@@ -576,16 +576,14 @@ xfs_da_node_add(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk, 
	xfs_da_intnode_t *node;

	xfs_da_node_entry_t *btree;

	int tmp;

	xfs_mount_t *mp;



	node = oldblk->bp->data;

	mp = state->mp;

	ASSERT(be16_to_cpu(node->hdr.info.magic) == XFS_DA_NODE_MAGIC);

	ASSERT((oldblk->index >= 0) && (oldblk->index <= be16_to_cpu(node->hdr.count)));

	ASSERT(newblk->blkno != 0);

	if (state->args->whichfork == XFS_DATA_FORK)

		ASSERT(newblk->blkno >= mp->m_dirleafblk &&

		       newblk->blkno < mp->m_dirfreeblk);

		ASSERT(newblk->blkno >= state->mp->m_dirleafblk &&

		       newblk->blkno < state->mp->m_dirfreeblk);



	/*

	 * We may need to make some room before we insert the new node.

fs/xfs/xfs_dir2_block.c

+3 −3
Original line number Diff line number Diff line
@@ -1071,10 +1071,10 @@ xfs_dir2_sf_to_block( 
	 */



	buf_len = dp->i_df.if_bytes;

	buf = kmem_alloc(dp->i_df.if_bytes, KM_SLEEP);

	buf = kmem_alloc(buf_len, KM_SLEEP);



	memcpy(buf, sfp, dp->i_df.if_bytes);

	xfs_idata_realloc(dp, -dp->i_df.if_bytes, XFS_DATA_FORK);

	memcpy(buf, sfp, buf_len);

	xfs_idata_realloc(dp, -buf_len, XFS_DATA_FORK);

	dp->i_d.di_size = 0;

	xfs_trans_log_inode(tp, dp, XFS_ILOG_CORE);

	/*

fs/xfs/xfs_iget.c

+0 −3
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ xfs_iget_cache_miss( 
{

	struct xfs_inode	*ip;

	int			error;

	unsigned long		first_index, mask;

	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ino);



	ip = xfs_inode_alloc(mp, ino);
@@ -298,8 +297,6 @@ xfs_iget_cache_miss( 
			BUG();

	}



	mask = ~(((XFS_INODE_CLUSTER_SIZE(mp) >> mp->m_sb.sb_inodelog)) - 1);

	first_index = agino & mask;

	write_lock(&pag->pag_ici_lock);



	/* insert the new inode */

fs/xfs/xfs_inode.c

+0 −4
Original line number Diff line number Diff line
@@ -918,7 +918,6 @@ xfs_iread_extents( 
	int		error;

	xfs_ifork_t	*ifp;

	xfs_extnum_t	nextents;

	size_t		size;



	if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {

		XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW,
@@ -926,7 +925,6 @@ xfs_iread_extents( 
		return XFS_ERROR(EFSCORRUPTED);

	}

	nextents = XFS_IFORK_NEXTENTS(ip, whichfork);

	size = nextents * sizeof(xfs_bmbt_rec_t);

	ifp = XFS_IFORK_PTR(ip, whichfork);



	/*
@@ -3503,13 +3501,11 @@ xfs_iext_remove_indirect( 
	xfs_extnum_t	ext_diff;	/* extents to remove in current list */

	xfs_extnum_t	nex1;		/* number of extents before idx */

	xfs_extnum_t	nex2;		/* extents after idx + count */

	int		nlists;		/* entries in indirection array */

	int		page_idx = idx;	/* index in target extent list */



	ASSERT(ifp->if_flags & XFS_IFEXTIREC);

	erp = xfs_iext_idx_to_irec(ifp,  &page_idx, &erp_idx, 0);

	ASSERT(erp != NULL);

	nlists = ifp->if_real_bytes / XFS_IEXT_BUFSZ;

	nex1 = page_idx;

	ext_cnt = count;

	while (ext_cnt) {