Commit 5837f625 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: clean up iunlink functions 



Fix some indentation issues with the iunlink functions and reorganize
the tops of the functions to be identical.  No functional changes.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent c2b31643

fs/xfs/xfs_inode.c

+32 −47
Original line number Diff line number Diff line
@@ -1921,23 +1921,21 @@ xfs_iunlink( 
	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	xfs_mount_t	*mp = tp->t_mountp;

	xfs_agi_t	*agi;

	xfs_dinode_t	*dip;

	xfs_buf_t	*agibp;

	xfs_buf_t	*ibp;

	xfs_agino_t	agino;

	short		bucket_index;

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agi		*agi;

	struct xfs_dinode	*dip;

	struct xfs_buf		*agibp;

	struct xfs_buf		*ibp;

	xfs_agnumber_t		agno = XFS_INO_TO_AGNO(mp, ip->i_ino);

	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ip->i_ino);

	short			bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;

	int			offset;

	int			error;



	ASSERT(VFS_I(ip)->i_mode != 0);



	/*

	 * Get the agi buffer first.  It ensures lock ordering

	 * on the list.

	 */

	error = xfs_read_agi(mp, tp, XFS_INO_TO_AGNO(mp, ip->i_ino), &agibp);

	/* Get the agi buffer first.  It ensures lock ordering on the list. */

	error = xfs_read_agi(mp, tp, agno, &agibp);

	if (error)

		return error;

	agi = XFS_BUF_TO_AGI(agibp);
@@ -1946,9 +1944,6 @@ xfs_iunlink( 
	 * Get the index into the agi hash table for the

	 * list this inode will go on.

	 */

	agino = XFS_INO_TO_AGINO(mp, ip->i_ino);

	ASSERT(agino != 0);

	bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;

	ASSERT(agi->agi_unlinked[bucket_index]);

	ASSERT(be32_to_cpu(agi->agi_unlinked[bucket_index]) != agino);
@@ -1995,45 +1990,35 @@ xfs_iunlink( 
 */

STATIC int

xfs_iunlink_remove(

	xfs_trans_t	*tp,

	xfs_inode_t	*ip)

	struct xfs_trans	*tp,

	struct xfs_inode	*ip)

{

	struct xfs_mount	*mp = tp->t_mountp;

	struct xfs_agi		*agi;

	struct xfs_dinode	*dip;

	struct xfs_buf		*agibp;

	struct xfs_buf		*ibp;

	struct xfs_buf		*last_ibp;

	struct xfs_dinode	*last_dip = NULL;

	xfs_ino_t		next_ino;

	xfs_mount_t	*mp;

	xfs_agi_t	*agi;

	xfs_dinode_t	*dip;

	xfs_buf_t	*agibp;

	xfs_buf_t	*ibp;

	xfs_agnumber_t	agno;

	xfs_agino_t	agino;

	xfs_agnumber_t		agno = XFS_INO_TO_AGNO(mp, ip->i_ino);

	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ip->i_ino);

	xfs_agino_t		next_agino;

	xfs_buf_t	*last_ibp;

	xfs_dinode_t	*last_dip = NULL;

	short		bucket_index;

	int		offset, last_offset = 0;

	short			bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;

	int			offset;

	int			last_offset = 0;

	int			error;



	mp = tp->t_mountp;

	agno = XFS_INO_TO_AGNO(mp, ip->i_ino);



	/*

	 * Get the agi buffer first.  It ensures lock ordering

	 * on the list.

	 */

	/* Get the agi buffer first.  It ensures lock ordering on the list. */

	error = xfs_read_agi(mp, tp, agno, &agibp);

	if (error)

		return error;



	agi = XFS_BUF_TO_AGI(agibp);



	/*

	 * Get the index into the agi hash table for the

	 * list this inode will go on.

	 */

	agino = XFS_INO_TO_AGINO(mp, ip->i_ino);

	if (!xfs_verify_agino(mp, agno, agino))

		return -EFSCORRUPTED;

	bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;

	if (!xfs_verify_agino(mp, agno,

			be32_to_cpu(agi->agi_unlinked[bucket_index]))) {

		XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,