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

Commit 376c2f3a authored by Roger Willcocks's avatar Roger Willcocks Committed by Dave Chinner
Browse files

xfs: fix compile error when libxfs header used in C++ code 



xfs_ialloc.h:102: error: expected ',' or '...' before 'delete'

Simple parameter rename, no changes to behaviour.

Signed-off-by: default avatarRoger Willcocks <roger@filmlight.ltd.uk>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 8695d27e

fs/xfs/xfs_ialloc.c

+3 −3
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ xfs_difree( 
	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_ino_t	inode,		/* inode to be freed */

	xfs_bmap_free_t	*flist,		/* extents to free */

	int		*delete,	/* set if inode cluster was deleted */

	int		*deleted,	/* set if inode cluster was deleted */

	xfs_ino_t	*first_ino)	/* first inode in deleted cluster */

{

	/* REFERENCED */
@@ -1209,7 +1209,7 @@ xfs_difree( 
	if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&

	    (rec.ir_freecount == mp->m_ialloc_inos)) {



		*delete = 1;

		*deleted = 1;

		*first_ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino);



		/*
@@ -1237,7 +1237,7 @@ xfs_difree( 
				  XFS_AGINO_TO_AGBNO(mp, rec.ir_startino)),

				  mp->m_ialloc_blks, flist, mp);

	} else {

		*delete = 0;

		*deleted = 0;



		error = xfs_inobt_update(cur, &rec);

		if (error) {

fs/xfs/xfs_ialloc.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ xfs_difree( 
	struct xfs_trans *tp,		/* transaction pointer */

	xfs_ino_t	inode,		/* inode to be freed */

	struct xfs_bmap_free *flist,	/* extents to free */

	int		*delete,	/* set if inode cluster was deleted */

	int		*deleted,	/* set if inode cluster was deleted */

	xfs_ino_t	*first_ino);	/* first inode in deleted cluster */



/*