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

Commit 45c51b99 authored by David Sterba's avatar David Sterba Committed by Alex Elder
Browse files

xfs: cleanup duplicate initializations 



follow these guidelines:
- leave initialization in the declaration block if it fits the line
- move to the code where it's more suitable ('for' init block)

The last chunk was modified from David's original to be a correct
fix for what appeared to be a duplicate initialization.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 8a072a4d

fs/xfs/xfs_dfrag.c

+1 −5
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ xfs_swap_extents( 
	xfs_inode_t	*tip,	/* tmp inode */

	xfs_swapext_t	*sxp)

{

	xfs_mount_t	*mp;

	xfs_mount_t	*mp = ip->i_mount;

	xfs_trans_t	*tp;

	xfs_bstat_t	*sbp = &sxp->sx_stat;

	xfs_ifork_t	*tempifp, *ifp, *tifp;
@@ -212,16 +212,12 @@ xfs_swap_extents( 
	int		taforkblks = 0;

	__uint64_t	tmp;



	mp = ip->i_mount;



	tempifp = kmem_alloc(sizeof(xfs_ifork_t), KM_MAYFAIL);

	if (!tempifp) {

		error = XFS_ERROR(ENOMEM);

		goto out;

	}



	sbp = &sxp->sx_stat;



	/*

	 * we have to do two separate lock calls here to keep lockdep

	 * happy. If we try to get all the locks in one call, lock will

fs/xfs/xfs_inode_item.c

+0 −1
Original line number Diff line number Diff line
@@ -970,7 +970,6 @@ xfs_iflush_abort( 
{

	xfs_inode_log_item_t	*iip = ip->i_itemp;



	iip = ip->i_itemp;

	if (iip) {

		struct xfs_ail	*ailp = iip->ili_item.li_ailp;

		if (iip->ili_item.li_flags & XFS_LI_IN_AIL) {

fs/xfs/xfs_mount.c

+2 −2
Original line number Diff line number Diff line
@@ -1900,7 +1900,7 @@ xfs_mod_incore_sb_batch( 
	uint			nmsb,

	int			rsvd)

{

	xfs_mod_sb_t		*msbp = &msb[0];

	xfs_mod_sb_t		*msbp;

	int			error = 0;



	/*
@@ -1910,7 +1910,7 @@ xfs_mod_incore_sb_batch( 
	 * changes will be atomic.

	 */

	spin_lock(&mp->m_sb_lock);

	for (msbp = &msbp[0]; msbp < (msb + nmsb); msbp++) {

	for (msbp = msb; msbp < (msb + nmsb); msbp++) {

		ASSERT(msbp->msb_field < XFS_SBS_ICOUNT ||

		       msbp->msb_field > XFS_SBS_FDBLOCKS);