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

xfs: convert xfs_extlen_t to xfs_rtxlen_t in the rt allocator 



In most of the filesystem, we use xfs_extlen_t to store the length of a
file (or AG) space mapping in units of fs blocks.  Unfortunately, the
realtime allocator also uses it to store the length of a rt space
mapping in units of rt extents.  This is confusing, since one rt extent
can consist of many fs blocks.

Separate the two by introducing a new type (xfs_rtxlen_t) to store the
length of a space mapping (in units of realtime extents) that would be
found in a file.

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

fs/xfs/libxfs/xfs_rtbitmap.c

+6 −6
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ xfs_rtmodify_range( 
	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	start,		/* starting block to modify */

	xfs_extlen_t	len,		/* length of extent to modify */

	xfs_rtxlen_t	len,		/* length of extent to modify */

	int		val)		/* 1 for free, 0 for allocated */

{

	xfs_rtword_t	*b;		/* current word in buffer */
@@ -690,7 +690,7 @@ xfs_rtfree_range( 
	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	start,		/* starting block to free */

	xfs_extlen_t	len,		/* length to free */

	xfs_rtxlen_t	len,		/* length to free */

	struct xfs_buf	**rbpp,		/* in/out: summary block buffer */

	xfs_fsblock_t	*rsb)		/* in/out: summary block number */

{
@@ -766,7 +766,7 @@ xfs_rtcheck_range( 
	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	start,		/* starting block number of extent */

	xfs_extlen_t	len,		/* length of extent */

	xfs_rtxlen_t	len,		/* length of extent */

	int		val,		/* 1 for free, 0 for allocated */

	xfs_rtblock_t	*new,		/* out: first block not matching */

	int		*stat)		/* out: 1 for matches, 0 for not */
@@ -942,7 +942,7 @@ xfs_rtcheck_alloc_range( 
	xfs_mount_t	*mp,		/* file system mount point */

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	bno,		/* starting block number of extent */

	xfs_extlen_t	len)		/* length of extent */

	xfs_rtxlen_t	len)		/* length of extent */

{

	xfs_rtblock_t	new;		/* dummy for xfs_rtcheck_range */

	int		stat;
@@ -965,7 +965,7 @@ int /* error */ 
xfs_rtfree_extent(

	xfs_trans_t	*tp,		/* transaction pointer */

	xfs_rtblock_t	bno,		/* starting block number to free */

	xfs_extlen_t	len)		/* length of extent freed */

	xfs_rtxlen_t	len)		/* length of extent freed */

{

	int		error;		/* error value */

	xfs_mount_t	*mp;		/* file system mount structure */
@@ -1116,7 +1116,7 @@ xfs_rtalloc_extent_is_free( 
	struct xfs_mount		*mp,

	struct xfs_trans		*tp,

	xfs_rtblock_t			start,

	xfs_extlen_t			len,

	xfs_rtxlen_t			len,

	bool				*is_free)

{

	xfs_rtblock_t			end;

fs/xfs/libxfs/xfs_rtbitmap.h

+5 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef int (*xfs_rtalloc_query_range_fn)( 
int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp,

		  xfs_rtblock_t block, int issum, struct xfs_buf **bpp);

int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp,

		      xfs_rtblock_t start, xfs_extlen_t len, int val,

		      xfs_rtblock_t start, xfs_rtxlen_t len, int val,

		      xfs_rtblock_t *new, int *stat);

int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp,

		    xfs_rtblock_t start, xfs_rtblock_t limit,
@@ -35,7 +35,7 @@ int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp, 
		    xfs_rtblock_t start, xfs_rtblock_t limit,

		    xfs_rtblock_t *rtblock);

int xfs_rtmodify_range(struct xfs_mount *mp, struct xfs_trans *tp,

		       xfs_rtblock_t start, xfs_extlen_t len, int val);

		       xfs_rtblock_t start, xfs_rtxlen_t len, int val);

int xfs_rtmodify_summary_int(struct xfs_mount *mp, struct xfs_trans *tp,

			     int log, xfs_rtblock_t bbno, int delta,

			     struct xfs_buf **rbpp, xfs_fsblock_t *rsb,
@@ -44,7 +44,7 @@ int xfs_rtmodify_summary(struct xfs_mount *mp, struct xfs_trans *tp, int log, 
			 xfs_rtblock_t bbno, int delta, struct xfs_buf **rbpp,

			 xfs_fsblock_t *rsb);

int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,

		     xfs_rtblock_t start, xfs_extlen_t len,

		     xfs_rtblock_t start, xfs_rtxlen_t len,

		     struct xfs_buf **rbpp, xfs_fsblock_t *rsb);

int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp,

		const struct xfs_rtalloc_rec *low_rec,
@@ -53,9 +53,8 @@ int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp, 
int xfs_rtalloc_query_all(struct xfs_mount *mp, struct xfs_trans *tp,

			  xfs_rtalloc_query_range_fn fn,

			  void *priv);

bool xfs_verify_rtbno(struct xfs_mount *mp, xfs_rtblock_t rtbno);

int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp,

			       xfs_rtblock_t start, xfs_extlen_t len,

			       xfs_rtblock_t start, xfs_rtxlen_t len,

			       bool *is_free);

/*

 * Free an extent in the realtime subvolume.  Length is expressed in
@@ -65,7 +64,7 @@ int /* error */ 
xfs_rtfree_extent(

	struct xfs_trans	*tp,	/* transaction pointer */

	xfs_rtblock_t		bno,	/* starting block number to free */

	xfs_extlen_t		len);	/* length of extent freed */

	xfs_rtxlen_t		len);	/* length of extent freed */



/* Same as above, but in units of rt blocks. */

int xfs_rtfree_blocks(struct xfs_trans *tp, xfs_fsblock_t rtbno,

fs/xfs/libxfs/xfs_types.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ typedef uint32_t prid_t; /* project ID */ 
typedef uint32_t	xfs_agblock_t;	/* blockno in alloc. group */

typedef uint32_t	xfs_agino_t;	/* inode # within allocation grp */

typedef uint32_t	xfs_extlen_t;	/* extent length in blocks */

typedef uint32_t	xfs_rtxlen_t;	/* file extent length in rtextents */

typedef uint32_t	xfs_agnumber_t;	/* allocation group number */

typedef uint64_t	xfs_extnum_t;	/* # of extents in a file */

typedef uint32_t	xfs_aextnum_t;	/* # extents in an attribute fork */

fs/xfs/scrub/rtbitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ xchk_xref_is_used_rt_space( 
{

	xfs_rtblock_t		startext;

	xfs_rtblock_t		endext;

	xfs_rtblock_t		extcount;

	xfs_rtxlen_t		extcount;

	bool			is_free;

	int			error;

fs/xfs/xfs_bmap_util.c

+3 −3
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ xfs_bmap_rtalloc( 
	struct xfs_mount	*mp = ap->ip->i_mount;

	xfs_fileoff_t		orig_offset = ap->offset;

	xfs_rtblock_t		rtb;

	xfs_extlen_t		prod = 0;  /* product factor for allocators */

	xfs_rtxlen_t		prod = 0;  /* product factor for allocators */

	xfs_extlen_t		mod = 0;   /* product factor for allocators */

	xfs_extlen_t		ralen = 0; /* realtime allocation length */

	xfs_rtxlen_t		ralen = 0; /* realtime allocation length */

	xfs_extlen_t		align;     /* minimum allocation alignment */

	xfs_extlen_t		orig_length = ap->length;

	xfs_extlen_t		minlen = mp->m_sb.sb_rextsize;

	xfs_extlen_t		raminlen;

	xfs_rtxlen_t		raminlen;

	bool			rtlocked = false;

	bool			ignore_locality = false;

	int			error;