Commit 86210fbe authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: move various type verifiers to common file 



New verification functions like xfs_verify_fsbno() and
xfs_verify_agino() are spread across multiple files and different
header files. They really don't fit cleanly into the places they've
been put, and have wider scope than the current header includes.

Move the type verifiers to a new file in libxfs (xfs-types.c) and
the prototypes to xfs_types.h where they will be visible to all the
code that uses the types.

Signed-Off-By: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 4a2d01b0

fs/xfs/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ xfs-y += $(addprefix libxfs/, \ 
				   xfs_sb.o \

				   xfs_sb.o \

				   xfs_symlink_remote.o \

				   xfs_symlink_remote.o \

				   xfs_trans_resv.o \

				   xfs_trans_resv.o \

				   xfs_types.o \

				   )

				   )

# xfs_rtbitmap is shared with libxfs

# xfs_rtbitmap is shared with libxfs

xfs-$(CONFIG_XFS_RT)		+= $(addprefix libxfs/, \

xfs-$(CONFIG_XFS_RT)		+= $(addprefix libxfs/, \

fs/xfs/libxfs/xfs_alloc.c

+0 −49
Original line number Original line Diff line number Diff line
@@ -3123,55 +3123,6 @@ xfs_alloc_query_all( 
	return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query);

	return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query);

}

}





/* Find the size of the AG, in blocks. */

xfs_agblock_t

xfs_ag_block_count(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno)

{

	ASSERT(agno < mp->m_sb.sb_agcount);



	if (agno < mp->m_sb.sb_agcount - 1)

		return mp->m_sb.sb_agblocks;

	return mp->m_sb.sb_dblocks - (agno * mp->m_sb.sb_agblocks);

}



/*

 * Verify that an AG block number pointer neither points outside the AG

 * nor points at static metadata.

 */

bool

xfs_verify_agbno(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agblock_t		agbno)

{

	xfs_agblock_t		eoag;



	eoag = xfs_ag_block_count(mp, agno);

	if (agbno >= eoag)

		return false;

	if (agbno <= XFS_AGFL_BLOCK(mp))

		return false;

	return true;

}



/*

 * Verify that an FS block number pointer neither points outside the

 * filesystem nor points at static AG metadata.

 */

bool

xfs_verify_fsbno(

	struct xfs_mount	*mp,

	xfs_fsblock_t		fsbno)

{

	xfs_agnumber_t		agno = XFS_FSB_TO_AGNO(mp, fsbno);



	if (agno >= mp->m_sb.sb_agcount)

		return false;

	return xfs_verify_agbno(mp, agno, XFS_FSB_TO_AGBNO(mp, fsbno));

}



/* Is there a record covering a given extent? */

/* Is there a record covering a given extent? */

int

int

xfs_alloc_has_record(

xfs_alloc_has_record(

fs/xfs/libxfs/xfs_alloc.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -242,10 +242,6 @@ int xfs_alloc_query_range(struct xfs_btree_cur *cur, 
		xfs_alloc_query_range_fn fn, void *priv);

		xfs_alloc_query_range_fn fn, void *priv);

int xfs_alloc_query_all(struct xfs_btree_cur *cur, xfs_alloc_query_range_fn fn,

int xfs_alloc_query_all(struct xfs_btree_cur *cur, xfs_alloc_query_range_fn fn,

		void *priv);

		void *priv);

xfs_agblock_t xfs_ag_block_count(struct xfs_mount *mp, xfs_agnumber_t agno);

bool xfs_verify_agbno(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_agblock_t agbno);

bool xfs_verify_fsbno(struct xfs_mount *mp, xfs_fsblock_t fsbno);





int xfs_alloc_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno,

int xfs_alloc_has_record(struct xfs_btree_cur *cur, xfs_agblock_t bno,

		xfs_extlen_t len, bool *exist);

		xfs_extlen_t len, bool *exist);

fs/xfs/libxfs/xfs_ialloc.c

+0 −90
Original line number Original line Diff line number Diff line
@@ -2674,96 +2674,6 @@ xfs_ialloc_pagi_init( 
	return 0;

	return 0;

}

}





/* Calculate the first and last possible inode number in an AG. */

void

xfs_ialloc_agino_range(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agino_t		*first,

	xfs_agino_t		*last)

{

	xfs_agblock_t		bno;

	xfs_agblock_t		eoag;



	eoag = xfs_ag_block_count(mp, agno);



	/*

	 * Calculate the first inode, which will be in the first

	 * cluster-aligned block after the AGFL.

	 */

	bno = round_up(XFS_AGFL_BLOCK(mp) + 1,

			xfs_ialloc_cluster_alignment(mp));

	*first = XFS_OFFBNO_TO_AGINO(mp, bno, 0);



	/*

	 * Calculate the last inode, which will be at the end of the

	 * last (aligned) cluster that can be allocated in the AG.

	 */

	bno = round_down(eoag, xfs_ialloc_cluster_alignment(mp));

	*last = XFS_OFFBNO_TO_AGINO(mp, bno, 0) - 1;

}



/*

 * Verify that an AG inode number pointer neither points outside the AG

 * nor points at static metadata.

 */

bool

xfs_verify_agino(

	struct xfs_mount	*mp,

	xfs_agnumber_t		agno,

	xfs_agino_t		agino)

{

	xfs_agino_t		first;

	xfs_agino_t		last;



	xfs_ialloc_agino_range(mp, agno, &first, &last);

	return agino >= first && agino <= last;

}



/*

 * Verify that an FS inode number pointer neither points outside the

 * filesystem nor points at static AG metadata.

 */

bool

xfs_verify_ino(

	struct xfs_mount	*mp,

	xfs_ino_t		ino)

{

	xfs_agnumber_t		agno = XFS_INO_TO_AGNO(mp, ino);

	xfs_agino_t		agino = XFS_INO_TO_AGINO(mp, ino);



	if (agno >= mp->m_sb.sb_agcount)

		return false;

	if (XFS_AGINO_TO_INO(mp, agno, agino) != ino)

		return false;

	return xfs_verify_agino(mp, agno, agino);

}



/* Is this an internal inode number? */

bool

xfs_internal_inum(

	struct xfs_mount	*mp,

	xfs_ino_t		ino)

{

	return ino == mp->m_sb.sb_rbmino || ino == mp->m_sb.sb_rsumino ||

		(xfs_sb_version_hasquota(&mp->m_sb) &&

		 xfs_is_quota_inode(&mp->m_sb, ino));

}



/*

 * Verify that a directory entry's inode number doesn't point at an internal

 * inode, empty space, or static AG metadata.

 */

bool

xfs_verify_dir_ino(

	struct xfs_mount	*mp,

	xfs_ino_t		ino)

{

	if (xfs_internal_inum(mp, ino))

		return false;

	return xfs_verify_ino(mp, ino);

}



/* Is there an inode record covering a given range of inode numbers? */

/* Is there an inode record covering a given range of inode numbers? */

int

int

xfs_ialloc_has_inode_record(

xfs_ialloc_has_inode_record(

fs/xfs/libxfs/xfs_ialloc.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -169,12 +169,5 @@ int xfs_inobt_insert_rec(struct xfs_btree_cur *cur, uint16_t holemask, 
		int *stat);

		int *stat);





int xfs_ialloc_cluster_alignment(struct xfs_mount *mp);

int xfs_ialloc_cluster_alignment(struct xfs_mount *mp);

void xfs_ialloc_agino_range(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_agino_t *first, xfs_agino_t *last);

bool xfs_verify_agino(struct xfs_mount *mp, xfs_agnumber_t agno,

		xfs_agino_t agino);

bool xfs_verify_ino(struct xfs_mount *mp, xfs_ino_t ino);

bool xfs_internal_inum(struct xfs_mount *mp, xfs_ino_t ino);

bool xfs_verify_dir_ino(struct xfs_mount *mp, xfs_ino_t ino);





#endif	/* __XFS_IALLOC_H__ */
 
#endif	/* __XFS_IALLOC_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE