Commit 097b4b7b authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: convert rt summary macros to helpers 



Convert the realtime summary file macros to helper functions so that we
can improve type checking.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent a9948626

fs/xfs/libxfs/xfs_format.h

+1 −8
Original line number Diff line number Diff line
@@ -1144,15 +1144,8 @@ static inline bool xfs_dinode_has_large_extent_counts( 
#define	XFS_BLOCKMASK(mp)	((mp)->m_blockmask)



/*

 * RT Summary and bit manipulation macros.

 * RT bit manipulation macros.

 */

#define	XFS_SUMOFFS(mp,ls,bb)	((int)((ls) * (mp)->m_sb.sb_rbmblocks + (bb)))

#define	XFS_SUMOFFSTOBLOCK(mp,s)	\

	(((s) * (uint)sizeof(xfs_suminfo_t)) >> (mp)->m_sb.sb_blocklog)

#define	XFS_SUMPTR(mp,bp,so)	\

	((xfs_suminfo_t *)((bp)->b_addr + \

		(((so) * (uint)sizeof(xfs_suminfo_t)) & XFS_BLOCKMASK(mp))))



#define	XFS_RTMIN(a,b)	((a) < (b) ? (a) : (b))

#define	XFS_RTMAX(a,b)	((a) > (b) ? (a) : (b))

fs/xfs/libxfs/xfs_rtbitmap.c

+6 −4
Original line number Diff line number Diff line
@@ -455,17 +455,18 @@ xfs_rtmodify_summary_int( 
	struct xfs_buf	*bp;		/* buffer for the summary block */

	int		error;		/* error value */

	xfs_fileoff_t	sb;		/* summary fsblock */

	int		so;		/* index into the summary file */

	xfs_rtsumoff_t	so;		/* index into the summary file */

	xfs_suminfo_t	*sp;		/* pointer to returned data */

	unsigned int	infoword;



	/*

	 * Compute entry number in the summary file.

	 */

	so = XFS_SUMOFFS(mp, log, bbno);

	so = xfs_rtsumoffs(mp, log, bbno);

	/*

	 * Compute the block number in the summary file.

	 */

	sb = XFS_SUMOFFSTOBLOCK(mp, so);

	sb = xfs_rtsumoffs_to_block(mp, so);

	/*

	 * If we have an old buffer, and the block number matches, use that.

	 */
@@ -493,7 +494,8 @@ xfs_rtmodify_summary_int( 
	/*

	 * Point to the summary information, modify/log it, and/or copy it out.

	 */

	sp = XFS_SUMPTR(mp, bp, so);

	infoword = xfs_rtsumoffs_to_infoword(mp, so);

	sp = xfs_rsumblock_infoptr(bp, infoword);

	if (delta) {

		uint first = (uint)((char *)sp - (char *)bp->b_addr);

fs/xfs/libxfs/xfs_rtbitmap.h

+50 −0
Original line number Diff line number Diff line
@@ -169,6 +169,56 @@ xfs_rbmblock_wordptr( 
	return words + index;

}



/*

 * Convert a rt extent length and rt bitmap block number to a xfs_suminfo_t

 * offset within the rt summary file.

 */

static inline xfs_rtsumoff_t

xfs_rtsumoffs(

	struct xfs_mount	*mp,

	int			log2_len,

	xfs_fileoff_t		rbmoff)

{

	return log2_len * mp->m_sb.sb_rbmblocks + rbmoff;

}



/*

 * Convert an xfs_suminfo_t offset to a file block offset within the rt summary

 * file.

 */

static inline xfs_fileoff_t

xfs_rtsumoffs_to_block(

	struct xfs_mount	*mp,

	xfs_rtsumoff_t		rsumoff)

{

	return XFS_B_TO_FSBT(mp, rsumoff * sizeof(xfs_suminfo_t));

}



/*

 * Convert an xfs_suminfo_t offset to an info word offset within an rt summary

 * block.

 */

static inline unsigned int

xfs_rtsumoffs_to_infoword(

	struct xfs_mount	*mp,

	xfs_rtsumoff_t		rsumoff)

{

	unsigned int		mask = mp->m_blockmask >> XFS_SUMINFOLOG;



	return rsumoff & mask;

}



/* Return a pointer to a summary info word within a rt summary block. */

static inline xfs_suminfo_t *

xfs_rsumblock_infoptr(

	struct xfs_buf		*bp,

	unsigned int		index)

{

	xfs_suminfo_t		*info = bp->b_addr;



	return info + index;

}



/*

 * Functions for walking free space rtextents in the realtime bitmap.

 */

fs/xfs/libxfs/xfs_types.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ typedef int64_t xfs_fsize_t; /* bytes in a file */ 
typedef uint64_t	xfs_ufsize_t;	/* unsigned bytes in a file */



typedef int32_t		xfs_suminfo_t;	/* type of bitmap summary info */

typedef uint32_t	xfs_rtsumoff_t;	/* offset of an rtsummary info word */

typedef uint32_t	xfs_rtword_t;	/* word type for bitmap manipulations */



typedef int64_t		xfs_lsn_t;	/* log sequence number */
@@ -149,6 +150,7 @@ typedef uint32_t xfs_dqid_t; 
 */

#define	XFS_NBBYLOG	3		/* log2(NBBY) */

#define	XFS_WORDLOG	2		/* log2(sizeof(xfs_rtword_t)) */

#define	XFS_SUMINFOLOG	2		/* log2(sizeof(xfs_suminfo_t)) */

#define	XFS_NBWORDLOG	(XFS_NBBYLOG + XFS_WORDLOG)

#define	XFS_NBWORD	(1 << XFS_NBWORDLOG)

#define	XFS_WORDMASK	((1 << XFS_WORDLOG) - 1)

fs/xfs/scrub/rtsummary.c

+8 −6
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ typedef unsigned int xchk_rtsumoff_t; 
static inline int

xfsum_load(

	struct xfs_scrub	*sc,

	xchk_rtsumoff_t		sumoff,

	xfs_rtsumoff_t		sumoff,

	xfs_suminfo_t		*info)

{

	return xfile_obj_load(sc->xfile, info, sizeof(xfs_suminfo_t),
@@ -91,7 +91,7 @@ xfsum_load( 
static inline int

xfsum_store(

	struct xfs_scrub	*sc,

	xchk_rtsumoff_t		sumoff,

	xfs_rtsumoff_t		sumoff,

	const xfs_suminfo_t	info)

{

	return xfile_obj_store(sc->xfile, &info, sizeof(xfs_suminfo_t),
@@ -101,7 +101,7 @@ xfsum_store( 
static inline int

xfsum_copyout(

	struct xfs_scrub	*sc,

	xchk_rtsumoff_t		sumoff,

	xfs_rtsumoff_t		sumoff,

	xfs_suminfo_t		*info,

	unsigned int		nr_words)

{
@@ -121,7 +121,7 @@ xchk_rtsum_record_free( 
	xfs_fileoff_t			rbmoff;

	xfs_rtblock_t			rtbno;

	xfs_filblks_t			rtlen;

	xchk_rtsumoff_t			offs;

	xfs_rtsumoff_t			offs;

	unsigned int			lenlog;

	xfs_suminfo_t			v = 0;

	int				error = 0;
@@ -132,7 +132,7 @@ xchk_rtsum_record_free( 
	/* Compute the relevant location in the rtsum file. */

	rbmoff = xfs_rtx_to_rbmblock(mp, rec->ar_startext);

	lenlog = XFS_RTBLOCKLOG(rec->ar_extcount);

	offs = XFS_SUMOFFS(mp, lenlog, rbmoff);

	offs = xfs_rtsumoffs(mp, lenlog, rbmoff);



	rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);

	rtlen = xfs_rtx_to_rtb(mp, rec->ar_extcount);
@@ -185,6 +185,7 @@ xchk_rtsum_compare( 
	int			nmap;



	for (off = 0; off < XFS_B_TO_FSB(mp, mp->m_rsumsize); off++) {

		xfs_suminfo_t	*ondisk_info;

		int		error = 0;



		if (xchk_should_terminate(sc, &error))
@@ -216,7 +217,8 @@ xchk_rtsum_compare( 
			return error;

		}



		if (memcmp(bp->b_addr, sc->buf,

		ondisk_info = xfs_rsumblock_infoptr(bp, 0);

		if (memcmp(ondisk_info, sc->buf,

					mp->m_blockwsize << XFS_WORDLOG) != 0)

			xchk_fblock_set_corrupt(sc, XFS_DATA_FORK, off);