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

Commit 413d57c9 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Linus Torvalds
Browse files

xfs: convert beX_add to beX_add_cpu (new common API) 



remove beX_add functions and replace all uses with beX_add_cpu

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Reviewed-by: default avatarDave Chinner <dgc@sgi.com>
Cc: Timothy Shimmin <tes@sgi.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91d35dd9

fs/xfs/quota/xfs_qm.c

+3 −3
Original line number Diff line number Diff line
@@ -1648,14 +1648,14 @@ xfs_qm_quotacheck_dqadjust( 
	 * Adjust the inode count and the block count to reflect this inode's

	 * resource usage.

	 */

	be64_add(&dqp->q_core.d_icount, 1);

	be64_add_cpu(&dqp->q_core.d_icount, 1);

	dqp->q_res_icount++;

	if (nblks) {

		be64_add(&dqp->q_core.d_bcount, nblks);

		be64_add_cpu(&dqp->q_core.d_bcount, nblks);

		dqp->q_res_bcount += nblks;

	}

	if (rtblks) {

		be64_add(&dqp->q_core.d_rtbcount, rtblks);

		be64_add_cpu(&dqp->q_core.d_rtbcount, rtblks);

		dqp->q_res_rtbcount += rtblks;

	}

fs/xfs/quota/xfs_trans_dquot.c

+3 −3
Original line number Diff line number Diff line
@@ -421,13 +421,13 @@ xfs_trans_apply_dquot_deltas( 
				       (xfs_qcnt_t) -qtrx->qt_icount_delta);

#endif

			if (totalbdelta)

				be64_add(&d->d_bcount, (xfs_qcnt_t)totalbdelta);

				be64_add_cpu(&d->d_bcount, (xfs_qcnt_t)totalbdelta);



			if (qtrx->qt_icount_delta)

				be64_add(&d->d_icount, (xfs_qcnt_t)qtrx->qt_icount_delta);

				be64_add_cpu(&d->d_icount, (xfs_qcnt_t)qtrx->qt_icount_delta);



			if (totalrtbdelta)

				be64_add(&d->d_rtbcount, (xfs_qcnt_t)totalrtbdelta);

				be64_add_cpu(&d->d_rtbcount, (xfs_qcnt_t)totalrtbdelta);



			/*

			 * Get any default limits in use.

fs/xfs/xfs_alloc.c

+8 −8
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ xfs_alloc_ag_vextent( 
		if (!(args->wasfromfl)) {



			agf = XFS_BUF_TO_AGF(args->agbp);

			be32_add(&agf->agf_freeblks, -(args->len));

			be32_add_cpu(&agf->agf_freeblks, -(args->len));

			xfs_trans_agblocks_delta(args->tp,

						 -((long)(args->len)));

			args->pag->pagf_freeblks -= args->len;
@@ -1720,7 +1720,7 @@ xfs_free_ag_extent( 


		agf = XFS_BUF_TO_AGF(agbp);

		pag = &mp->m_perag[agno];

		be32_add(&agf->agf_freeblks, len);

		be32_add_cpu(&agf->agf_freeblks, len);

		xfs_trans_agblocks_delta(tp, len);

		pag->pagf_freeblks += len;

		XFS_WANT_CORRUPTED_GOTO(
@@ -2008,18 +2008,18 @@ xfs_alloc_get_freelist( 
	 * Get the block number and update the data structures.

	 */

	bno = be32_to_cpu(agfl->agfl_bno[be32_to_cpu(agf->agf_flfirst)]);

	be32_add(&agf->agf_flfirst, 1);

	be32_add_cpu(&agf->agf_flfirst, 1);

	xfs_trans_brelse(tp, agflbp);

	if (be32_to_cpu(agf->agf_flfirst) == XFS_AGFL_SIZE(mp))

		agf->agf_flfirst = 0;

	pag = &mp->m_perag[be32_to_cpu(agf->agf_seqno)];

	be32_add(&agf->agf_flcount, -1);

	be32_add_cpu(&agf->agf_flcount, -1);

	xfs_trans_agflist_delta(tp, -1);

	pag->pagf_flcount--;



	logflags = XFS_AGF_FLFIRST | XFS_AGF_FLCOUNT;

	if (btreeblk) {

		be32_add(&agf->agf_btreeblks, 1);

		be32_add_cpu(&agf->agf_btreeblks, 1);

		pag->pagf_btreeblks++;

		logflags |= XFS_AGF_BTREEBLKS;

	}
@@ -2117,17 +2117,17 @@ xfs_alloc_put_freelist( 
			be32_to_cpu(agf->agf_seqno), &agflbp)))

		return error;

	agfl = XFS_BUF_TO_AGFL(agflbp);

	be32_add(&agf->agf_fllast, 1);

	be32_add_cpu(&agf->agf_fllast, 1);

	if (be32_to_cpu(agf->agf_fllast) == XFS_AGFL_SIZE(mp))

		agf->agf_fllast = 0;

	pag = &mp->m_perag[be32_to_cpu(agf->agf_seqno)];

	be32_add(&agf->agf_flcount, 1);

	be32_add_cpu(&agf->agf_flcount, 1);

	xfs_trans_agflist_delta(tp, 1);

	pag->pagf_flcount++;



	logflags = XFS_AGF_FLLAST | XFS_AGF_FLCOUNT;

	if (btreeblk) {

		be32_add(&agf->agf_btreeblks, -1);

		be32_add_cpu(&agf->agf_btreeblks, -1);

		pag->pagf_btreeblks--;

		logflags |= XFS_AGF_BTREEBLKS;

	}

fs/xfs/xfs_alloc_btree.c

+8 −8
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ xfs_alloc_delrec( 
			 */

			bno = be32_to_cpu(agf->agf_roots[cur->bc_btnum]);

			agf->agf_roots[cur->bc_btnum] = *lpp;

			be32_add(&agf->agf_levels[cur->bc_btnum], -1);

			be32_add_cpu(&agf->agf_levels[cur->bc_btnum], -1);

			mp->m_perag[be32_to_cpu(agf->agf_seqno)].pagf_levels[cur->bc_btnum]--;

			/*

			 * Put this buffer/block on the ag's freelist.
@@ -1256,9 +1256,9 @@ xfs_alloc_lshift( 
	/*

	 * Bump and log left's numrecs, decrement and log right's numrecs.

	 */

	be16_add(&left->bb_numrecs, 1);

	be16_add_cpu(&left->bb_numrecs, 1);

	xfs_alloc_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS);

	be16_add(&right->bb_numrecs, -1);

	be16_add_cpu(&right->bb_numrecs, -1);

	xfs_alloc_log_block(cur->bc_tp, rbp, XFS_BB_NUMRECS);

	/*

	 * Slide the contents of right down one entry.
@@ -1346,7 +1346,7 @@ xfs_alloc_newroot( 


		agf = XFS_BUF_TO_AGF(cur->bc_private.a.agbp);

		agf->agf_roots[cur->bc_btnum] = cpu_to_be32(nbno);

		be32_add(&agf->agf_levels[cur->bc_btnum], 1);

		be32_add_cpu(&agf->agf_levels[cur->bc_btnum], 1);

		seqno = be32_to_cpu(agf->agf_seqno);

		mp->m_perag[seqno].pagf_levels[cur->bc_btnum]++;

		xfs_alloc_log_agf(cur->bc_tp, cur->bc_private.a.agbp,
@@ -1558,9 +1558,9 @@ xfs_alloc_rshift( 
	/*

	 * Decrement and log left's numrecs, bump and log right's numrecs.

	 */

	be16_add(&left->bb_numrecs, -1);

	be16_add_cpu(&left->bb_numrecs, -1);

	xfs_alloc_log_block(cur->bc_tp, lbp, XFS_BB_NUMRECS);

	be16_add(&right->bb_numrecs, 1);

	be16_add_cpu(&right->bb_numrecs, 1);

	xfs_alloc_log_block(cur->bc_tp, rbp, XFS_BB_NUMRECS);

	/*

	 * Using a temporary cursor, update the parent key values of the
@@ -1643,7 +1643,7 @@ xfs_alloc_split( 
	 */

	if ((be16_to_cpu(left->bb_numrecs) & 1) &&

	    cur->bc_ptrs[level] <= be16_to_cpu(right->bb_numrecs) + 1)

		be16_add(&right->bb_numrecs, 1);

		be16_add_cpu(&right->bb_numrecs, 1);

	i = be16_to_cpu(left->bb_numrecs) - be16_to_cpu(right->bb_numrecs) + 1;

	/*

	 * For non-leaf blocks, copy keys and addresses over to the new block.
@@ -1689,7 +1689,7 @@ xfs_alloc_split( 
	 * Adjust numrecs, sibling pointers.

	 */

	lbno = XFS_DADDR_TO_AGBNO(cur->bc_mp, XFS_BUF_ADDR(lbp));

	be16_add(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs)));

	be16_add_cpu(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs)));

	right->bb_rightsib = left->bb_rightsib;

	left->bb_rightsib = cpu_to_be32(rbno);

	right->bb_leftsib = cpu_to_be32(lbno);

fs/xfs/xfs_arch.h

+0 −15
Original line number Diff line number Diff line
@@ -170,21 +170,6 @@ 
    } \

}



static inline void be16_add(__be16 *a, __s16 b)

{

	*a = cpu_to_be16(be16_to_cpu(*a) + b);

}



static inline void be32_add(__be32 *a, __s32 b)

{

	*a = cpu_to_be32(be32_to_cpu(*a) + b);

}



static inline void be64_add(__be64 *a, __s64 b)

{

	*a = cpu_to_be64(be64_to_cpu(*a) + b);

}



/*

 * In directories inode numbers are stored as unaligned arrays of unsigned

 * 8bit integers on disk.