Commit 39ee2239 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove all *_ITER_CONTINUE values 



Iterator functions already use 0 to signal "continue iterating", so get
rid of the #defines and just do it directly.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent e7ee96df

fs/xfs/libxfs/xfs_btree.h

+0 −1
Original line number Diff line number Diff line
@@ -471,7 +471,6 @@ unsigned long long xfs_btree_calc_size(uint *limits, unsigned long long len); 
 * used to stop iteration, because _query_range never generates that error

 * code on its own.

 */

#define XFS_BTREE_QUERY_RANGE_CONTINUE	(XFS_ITER_CONTINUE) /* keep iterating */

typedef int (*xfs_btree_query_range_fn)(struct xfs_btree_cur *cur,

		union xfs_btree_rec *rec, void *priv);

fs/xfs/libxfs/xfs_rmap.c

+4 −4
Original line number Diff line number Diff line
@@ -253,11 +253,11 @@ xfs_rmap_find_left_neighbor_helper( 
			rec->rm_flags);



	if (rec->rm_owner != info->high.rm_owner)

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;

	if (!XFS_RMAP_NON_INODE_OWNER(rec->rm_owner) &&

	    !(rec->rm_flags & XFS_RMAP_BMBT_BLOCK) &&

	    rec->rm_offset + rec->rm_blockcount - 1 != info->high.rm_offset)

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;



	*info->irec = *rec;

	*info->stat = 1;
@@ -329,12 +329,12 @@ xfs_rmap_lookup_le_range_helper( 
			rec->rm_flags);



	if (rec->rm_owner != info->high.rm_owner)

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;

	if (!XFS_RMAP_NON_INODE_OWNER(rec->rm_owner) &&

	    !(rec->rm_flags & XFS_RMAP_BMBT_BLOCK) &&

	    (rec->rm_offset > info->high.rm_offset ||

	     rec->rm_offset + rec->rm_blockcount <= info->high.rm_offset))

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;



	*info->irec = *rec;

	*info->stat = 1;

fs/xfs/libxfs/xfs_shared.h

+0 −3
Original line number Diff line number Diff line
@@ -177,7 +177,4 @@ struct xfs_ino_geometry { 
	unsigned int	agino_log;	/* #bits for agino in inum */

};



/* Keep iterating the data structure. */

#define XFS_ITER_CONTINUE	(0)



#endif /* __XFS_SHARED_H__ */

fs/xfs/xfs_fsmap.c

+4 −4
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ xfs_getfsmap_helper( 
		rec_daddr += XFS_FSB_TO_BB(mp, rec->rm_blockcount);

		if (info->next_daddr < rec_daddr)

			info->next_daddr = rec_daddr;

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;

	}



	/* Are we just counting mappings? */
@@ -259,14 +259,14 @@ xfs_getfsmap_helper( 
			info->head->fmh_entries++;



		if (info->last)

			return XFS_BTREE_QUERY_RANGE_CONTINUE;

			return 0;



		info->head->fmh_entries++;



		rec_daddr += XFS_FSB_TO_BB(mp, rec->rm_blockcount);

		if (info->next_daddr < rec_daddr)

			info->next_daddr = rec_daddr;

		return XFS_BTREE_QUERY_RANGE_CONTINUE;

		return 0;

	}



	/*
@@ -328,7 +328,7 @@ xfs_getfsmap_helper( 
	rec_daddr += XFS_FSB_TO_BB(mp, rec->rm_blockcount);

	if (info->next_daddr < rec_daddr)

		info->next_daddr = rec_daddr;

	return XFS_BTREE_QUERY_RANGE_CONTINUE;

	return 0;

}



/* Transform a rmapbt irec into a fsmap */

fs/xfs/xfs_iwalk.h

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
/* Walk all inodes in the filesystem starting from @startino. */

typedef int (*xfs_iwalk_fn)(struct xfs_mount *mp, struct xfs_trans *tp,

			    xfs_ino_t ino, void *data);

/* Return values for xfs_iwalk_fn. */

#define XFS_IWALK_CONTINUE	(XFS_ITER_CONTINUE)



int xfs_iwalk(struct xfs_mount *mp, struct xfs_trans *tp, xfs_ino_t startino,

		unsigned int flags, xfs_iwalk_fn iwalk_fn,