iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: consolidate realtime allocation arguments

Browse Source 
Consolidate the arguments passed around the rt allocator into a
struct xfs_rtalloc_arg similar to how the btree allocator arguments
are consolidated in a struct xfs_alloc_arg....

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Dave Chinner
2023-10-16 09:54:19 -07:00
committed by Darrick J. Wong
parent 663b8db7b0
commit 41f33d82cf
4 changed files with 386 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

366
fs/xfs/libxfs/xfs_rtbitmap.c
View File

@@ -53,17 +53,17 @@ const struct xfs_buf_ops xfs_rtbuf_ops = {
*/ */
int int
xfs_rtbuf_get( xfs_rtbuf_get(
xfs_mount_t *mp, /* file system mount structure */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_fileoff_t block, /* block number in bitmap or summary */
xfs_fileoff_t block, /* block number in bitmap or summary */ int issum, /* is summary not bitmap */
int issum, /* is summary not bitmap */ struct xfs_buf **bpp) /* output: buffer for the block */
struct xfs_buf **bpp) /* output: buffer for the block */
{ {
struct xfs_buf *bp; /* block buffer, result */ struct xfs_mount *mp = args->mp;
xfs_inode_t *ip; /* bitmap or summary inode */ struct xfs_buf *bp; /* block buffer, result */
xfs_bmbt_irec_t map; struct xfs_inode *ip; /* bitmap or summary inode */
int nmap = 1; struct xfs_bmbt_irec map;
int error; /* error value */ int nmap = 1;
int error;
ip = issum ? mp->m_rsumip : mp->m_rbmip; ip = issum ? mp->m_rsumip : mp->m_rbmip;
@@ -75,13 +75,13 @@ xfs_rtbuf_get(
return -EFSCORRUPTED; return -EFSCORRUPTED;
ASSERT(map.br_startblock != NULLFSBLOCK); ASSERT(map.br_startblock != NULLFSBLOCK);
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, error = xfs_trans_read_buf(mp, args->tp, mp->m_ddev_targp,
XFS_FSB_TO_DADDR(mp, map.br_startblock), XFS_FSB_TO_DADDR(mp, map.br_startblock),
mp->m_bsize, 0, &bp, &xfs_rtbuf_ops); mp->m_bsize, 0, &bp, &xfs_rtbuf_ops);
if (error) if (error)
return error; return error;
xfs_trans_buf_set_type(tp, bp, issum ? XFS_BLFT_RTSUMMARY_BUF xfs_trans_buf_set_type(args->tp, bp, issum ? XFS_BLFT_RTSUMMARY_BUF
: XFS_BLFT_RTBITMAP_BUF); : XFS_BLFT_RTBITMAP_BUF);
*bpp = bp; *bpp = bp;
return 0; return 0;
@@ -93,30 +93,30 @@ xfs_rtbuf_get(
*/ */
int int
xfs_rtfind_back( xfs_rtfind_back(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext to look at */
xfs_rtxnum_t start, /* starting rtext to look at */ xfs_rtxnum_t limit, /* last rtext to look at */
xfs_rtxnum_t limit, /* last rtext to look at */ xfs_rtxnum_t *rtx) /* out: start rtext found */
xfs_rtxnum_t *rtx) /* out: start rtext found */
{ {
int bit; /* bit number in the word */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t block; /* bitmap block number */ int bit; /* bit number in the word */
struct xfs_buf *bp; /* buf for the block */ xfs_fileoff_t block; /* bitmap block number */
int error; /* error value */ struct xfs_buf *bp; /* buf for the block */
xfs_rtxnum_t firstbit; /* first useful bit in the word */ int error; /* error value */
xfs_rtxnum_t i; /* current bit number rel. to start */ xfs_rtxnum_t firstbit; /* first useful bit in the word */
xfs_rtxnum_t len; /* length of inspected area */ xfs_rtxnum_t i; /* current bit number rel. to start */
xfs_rtword_t mask; /* mask of relevant bits for value */ xfs_rtxnum_t len; /* length of inspected area */
xfs_rtword_t want; /* mask for "good" values */ xfs_rtword_t mask; /* mask of relevant bits for value */
xfs_rtword_t wdiff; /* difference from wanted value */ xfs_rtword_t want; /* mask for "good" values */
xfs_rtword_t incore; xfs_rtword_t wdiff; /* difference from wanted value */
unsigned int word; /* word number in the buffer */ xfs_rtword_t incore;
unsigned int word; /* word number in the buffer */
/* /*
* Compute and read in starting bitmap block for starting block. * Compute and read in starting bitmap block for starting block.
*/ */
block = xfs_rtx_to_rbmblock(mp, start); block = xfs_rtx_to_rbmblock(mp, start);
error = xfs_rtbuf_get(mp, tp, block, 0, &bp); error = xfs_rtbuf_get(args, block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -153,7 +153,7 @@ xfs_rtfind_back(
/* /*
* Different. Mark where we are and return. * Different. Mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i = bit - XFS_RTHIBIT(wdiff); i = bit - XFS_RTHIBIT(wdiff);
*rtx = start - i + 1; *rtx = start - i + 1;
return 0; return 0;
@@ -167,8 +167,8 @@ xfs_rtfind_back(
/* /*
* If done with this block, get the previous one. * If done with this block, get the previous one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, --block, 0, &bp); error = xfs_rtbuf_get(args, --block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -194,7 +194,7 @@ xfs_rtfind_back(
/* /*
* Different, mark where we are and return. * Different, mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff); i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
*rtx = start - i + 1; *rtx = start - i + 1;
return 0; return 0;
@@ -208,8 +208,8 @@ xfs_rtfind_back(
/* /*
* If done with this block, get the previous one. * If done with this block, get the previous one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, --block, 0, &bp); error = xfs_rtbuf_get(args, --block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -236,7 +236,7 @@ xfs_rtfind_back(
/* /*
* Different, mark where we are and return. * Different, mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff); i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
*rtx = start - i + 1; *rtx = start - i + 1;
return 0; return 0;
@@ -246,7 +246,7 @@ xfs_rtfind_back(
/* /*
* No match, return that we scanned the whole area. * No match, return that we scanned the whole area.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
*rtx = start - i + 1; *rtx = start - i + 1;
return 0; return 0;
} }
@@ -257,30 +257,30 @@ xfs_rtfind_back(
*/ */
int int
xfs_rtfind_forw( xfs_rtfind_forw(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext to look at */
xfs_rtxnum_t start, /* starting rtext to look at */ xfs_rtxnum_t limit, /* last rtext to look at */
xfs_rtxnum_t limit, /* last rtext to look at */ xfs_rtxnum_t *rtx) /* out: start rtext found */
xfs_rtxnum_t *rtx) /* out: start rtext found */
{ {
int bit; /* bit number in the word */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t block; /* bitmap block number */ int bit; /* bit number in the word */
struct xfs_buf *bp; /* buf for the block */ xfs_fileoff_t block; /* bitmap block number */
int error; /* error value */ struct xfs_buf *bp; /* buf for the block */
xfs_rtxnum_t i; /* current bit number rel. to start */ int error;
xfs_rtxnum_t lastbit; /* last useful bit in the word */ xfs_rtxnum_t i; /* current bit number rel. to start */
xfs_rtxnum_t len; /* length of inspected area */ xfs_rtxnum_t lastbit;/* last useful bit in the word */
xfs_rtword_t mask; /* mask of relevant bits for value */ xfs_rtxnum_t len; /* length of inspected area */
xfs_rtword_t want; /* mask for "good" values */ xfs_rtword_t mask; /* mask of relevant bits for value */
xfs_rtword_t wdiff; /* difference from wanted value */ xfs_rtword_t want; /* mask for "good" values */
xfs_rtword_t incore; xfs_rtword_t wdiff; /* difference from wanted value */
unsigned int word; /* word number in the buffer */ xfs_rtword_t incore;
unsigned int word; /* word number in the buffer */
/* /*
* Compute and read in starting bitmap block for starting block. * Compute and read in starting bitmap block for starting block.
*/ */
block = xfs_rtx_to_rbmblock(mp, start); block = xfs_rtx_to_rbmblock(mp, start);
error = xfs_rtbuf_get(mp, tp, block, 0, &bp); error = xfs_rtbuf_get(args, block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -316,7 +316,7 @@ xfs_rtfind_forw(
/* /*
* Different. Mark where we are and return. * Different. Mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i = XFS_RTLOBIT(wdiff) - bit; i = XFS_RTLOBIT(wdiff) - bit;
*rtx = start + i - 1; *rtx = start + i - 1;
return 0; return 0;
@@ -330,8 +330,8 @@ xfs_rtfind_forw(
/* /*
* If done with this block, get the previous one. * If done with this block, get the previous one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -357,7 +357,7 @@ xfs_rtfind_forw(
/* /*
* Different, mark where we are and return. * Different, mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_RTLOBIT(wdiff); i += XFS_RTLOBIT(wdiff);
*rtx = start + i - 1; *rtx = start + i - 1;
return 0; return 0;
@@ -371,8 +371,8 @@ xfs_rtfind_forw(
/* /*
* If done with this block, get the next one. * If done with this block, get the next one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -397,7 +397,7 @@ xfs_rtfind_forw(
/* /*
* Different, mark where we are and return. * Different, mark where we are and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_RTLOBIT(wdiff); i += XFS_RTLOBIT(wdiff);
*rtx = start + i - 1; *rtx = start + i - 1;
return 0; return 0;
@@ -407,7 +407,7 @@ xfs_rtfind_forw(
/* /*
* No match, return that we scanned the whole area. * No match, return that we scanned the whole area.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
*rtx = start + i - 1; *rtx = start + i - 1;
return 0; return 0;
} }
@@ -438,20 +438,20 @@ xfs_trans_log_rtsummary(
*/ */
int int
xfs_rtmodify_summary_int( xfs_rtmodify_summary_int(
xfs_mount_t *mp, /* file system mount structure */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ int log, /* log2 of extent size */
int log, /* log2 of extent size */ xfs_fileoff_t bbno, /* bitmap block number */
xfs_fileoff_t bbno, /* bitmap block number */ int delta, /* change to make to summary info */
int delta, /* change to make to summary info */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_suminfo_t *sum) /* out: summary info for this block */
xfs_suminfo_t *sum) /* out: summary info for this block */
{ {
struct xfs_buf *bp; /* buffer for the summary block */ struct xfs_mount *mp = args->mp;
int error; /* error value */ struct xfs_buf *bp; /* buffer for the summary block */
xfs_fileoff_t sb; /* summary fsblock */ int error;
xfs_rtsumoff_t so; /* index into the summary file */ xfs_fileoff_t sb; /* summary fsblock */
unsigned int infoword; xfs_rtsumoff_t so; /* index into the summary file */
unsigned int infoword;
/* /*
* Compute entry number in the summary file. * Compute entry number in the summary file.
@@ -474,8 +474,8 @@ xfs_rtmodify_summary_int(
* If there was an old one, get rid of it first. * If there was an old one, get rid of it first.
*/ */
if (*rbpp) if (*rbpp)
xfs_trans_brelse(tp, *rbpp); xfs_trans_brelse(args->tp, *rbpp);
error = xfs_rtbuf_get(mp, tp, sb, 1, &bp); error = xfs_rtbuf_get(args, sb, 1, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -498,7 +498,7 @@ xfs_rtmodify_summary_int(
if (val != 0 && log < mp->m_rsum_cache[bbno]) if (val != 0 && log < mp->m_rsum_cache[bbno])
mp->m_rsum_cache[bbno] = log; mp->m_rsum_cache[bbno] = log;
} }
xfs_trans_log_rtsummary(tp, bp, infoword); xfs_trans_log_rtsummary(args->tp, bp, infoword);
if (sum) if (sum)
*sum = val; *sum = val;
} else if (sum) { } else if (sum) {
@@ -509,16 +509,14 @@ xfs_rtmodify_summary_int(
int int
xfs_rtmodify_summary( xfs_rtmodify_summary(
xfs_mount_t *mp, /* file system mount structure */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ int log, /* log2 of extent size */
int log, /* log2 of extent size */ xfs_fileoff_t bbno, /* bitmap block number */
xfs_fileoff_t bbno, /* bitmap block number */ int delta, /* change to make to summary info */
int delta, /* change to make to summary info */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb) /* in/out: summary block number */
xfs_fileoff_t *rsb) /* in/out: summary block number */
{ {
return xfs_rtmodify_summary_int(mp, tp, log, bbno, return xfs_rtmodify_summary_int(args, log, bbno, delta, rbpp, rsb, NULL);
delta, rbpp, rsb, NULL);
} }
/* Log rtbitmap block from the word @from to the byte before @next. */ /* Log rtbitmap block from the word @from to the byte before @next. */
@@ -543,22 +541,22 @@ xfs_trans_log_rtbitmap(
*/ */
int int
xfs_rtmodify_range( xfs_rtmodify_range(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext to modify */
xfs_rtxnum_t start, /* starting rtext to modify */ xfs_rtxlen_t len, /* length of extent to modify */
xfs_rtxlen_t len, /* length of extent to modify */ int val) /* 1 for free, 0 for allocated */
int val) /* 1 for free, 0 for allocated */
{ {
int bit; /* bit number in the word */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t block; /* bitmap block number */ int bit; /* bit number in the word */
struct xfs_buf *bp; /* buf for the block */ xfs_fileoff_t block; /* bitmap block number */
int error; /* error value */ struct xfs_buf *bp; /* buf for the block */
int i; /* current bit number rel. to start */ int error;
int lastbit; /* last useful bit in word */ int i; /* current bit number rel. to start */
xfs_rtword_t mask; /* mask o frelevant bits for value */ int lastbit; /* last useful bit in word */
xfs_rtword_t incore; xfs_rtword_t mask; /* mask of relevant bits for value */
unsigned int firstword; /* first word used in the buffer */ xfs_rtword_t incore;
unsigned int word; /* word number in the buffer */ unsigned int firstword; /* first word used in the buffer */
unsigned int word; /* word number in the buffer */
/* /*
* Compute starting bitmap block number. * Compute starting bitmap block number.
@@ -567,7 +565,7 @@ xfs_rtmodify_range(
/* /*
* Read the bitmap block, and point to its data. * Read the bitmap block, and point to its data.
*/ */
error = xfs_rtbuf_get(mp, tp, block, 0, &bp); error = xfs_rtbuf_get(args, block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -610,8 +608,9 @@ xfs_rtmodify_range(
* Log the changed part of this block. * Log the changed part of this block.
* Get the next one. * Get the next one.
*/ */
xfs_trans_log_rtbitmap(tp, bp, firstword, word); xfs_trans_log_rtbitmap(args->tp, bp, firstword,
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); word);
error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -643,11 +642,11 @@ xfs_rtmodify_range(
* Log the changed part of this block. * Log the changed part of this block.
* Get the next one. * Get the next one.
*/ */
xfs_trans_log_rtbitmap(tp, bp, firstword, word); xfs_trans_log_rtbitmap(args->tp, bp, firstword,
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); word);
if (error) { error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error)
return error; return error;
}
firstword = word = 0; firstword = word = 0;
} }
@@ -676,7 +675,7 @@ xfs_rtmodify_range(
* Log any remaining changed bytes. * Log any remaining changed bytes.
*/ */
if (word > firstword) if (word > firstword)
xfs_trans_log_rtbitmap(tp, bp, firstword, word); xfs_trans_log_rtbitmap(args->tp, bp, firstword, word);
return 0; return 0;
} }
@@ -686,23 +685,23 @@ xfs_rtmodify_range(
*/ */
int int
xfs_rtfree_range( xfs_rtfree_range(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext to free */
xfs_rtxnum_t start, /* starting rtext to free */ xfs_rtxlen_t len, /* length to free */
xfs_rtxlen_t len, /* length to free */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb) /* in/out: summary block number */
xfs_fileoff_t *rsb) /* in/out: summary block number */
{ {
xfs_rtxnum_t end; /* end of the freed extent */ struct xfs_mount *mp = args->mp;
int error; /* error value */ xfs_rtxnum_t end; /* end of the freed extent */
xfs_rtxnum_t postblock; /* first rtext freed > end */ int error; /* error value */
xfs_rtxnum_t preblock; /* first rtext freed < start */ xfs_rtxnum_t postblock; /* first rtext freed > end */
xfs_rtxnum_t preblock; /* first rtext freed < start */
end = start + len - 1; end = start + len - 1;
/* /*
* Modify the bitmap to mark this extent freed. * Modify the bitmap to mark this extent freed.
*/ */
error = xfs_rtmodify_range(mp, tp, start, len, 1); error = xfs_rtmodify_range(args, start, len, 1);
if (error) { if (error) {
return error; return error;
} }
@@ -711,14 +710,14 @@ xfs_rtfree_range(
* We need to find the beginning and end of the extent so we can * We need to find the beginning and end of the extent so we can
* properly update the summary. * properly update the summary.
*/ */
error = xfs_rtfind_back(mp, tp, start, 0, &preblock); error = xfs_rtfind_back(args, start, 0, &preblock);
if (error) { if (error) {
return error; return error;
} }
/* /*
* Find the next allocated block (end of allocated extent). * Find the next allocated block (end of allocated extent).
*/ */
error = xfs_rtfind_forw(mp, tp, end, mp->m_sb.sb_rextents - 1, error = xfs_rtfind_forw(args, end, mp->m_sb.sb_rextents - 1,
&postblock); &postblock);
if (error) if (error)
return error; return error;
@@ -727,7 +726,7 @@ xfs_rtfree_range(
* old extent, add summary data for them to be allocated. * old extent, add summary data for them to be allocated.
*/ */
if (preblock < start) { if (preblock < start) {
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(start - preblock), XFS_RTBLOCKLOG(start - preblock),
xfs_rtx_to_rbmblock(mp, preblock), -1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, preblock), -1, rbpp, rsb);
if (error) { if (error) {
@@ -739,7 +738,7 @@ xfs_rtfree_range(
* old extent, add summary data for them to be allocated. * old extent, add summary data for them to be allocated.
*/ */
if (postblock > end) { if (postblock > end) {
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(postblock - end), XFS_RTBLOCKLOG(postblock - end),
xfs_rtx_to_rbmblock(mp, end + 1), -1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, end + 1), -1, rbpp, rsb);
if (error) { if (error) {
@@ -750,7 +749,7 @@ xfs_rtfree_range(
* Increment the summary information corresponding to the entire * Increment the summary information corresponding to the entire
* (new) free extent. * (new) free extent.
*/ */
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(postblock + 1 - preblock), XFS_RTBLOCKLOG(postblock + 1 - preblock),
xfs_rtx_to_rbmblock(mp, preblock), 1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, preblock), 1, rbpp, rsb);
return error; return error;
@@ -762,24 +761,24 @@ xfs_rtfree_range(
*/ */
int int
xfs_rtcheck_range( xfs_rtcheck_range(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext number of extent */
xfs_rtxnum_t start, /* starting rtext number of extent */ xfs_rtxlen_t len, /* length of extent */
xfs_rtxlen_t len, /* length of extent */ int val, /* 1 for free, 0 for allocated */
int val, /* 1 for free, 0 for allocated */ xfs_rtxnum_t *new, /* out: first rtext not matching */
xfs_rtxnum_t *new, /* out: first rtext not matching */ int *stat) /* out: 1 for matches, 0 for not */
int *stat) /* out: 1 for matches, 0 for not */
{ {
int bit; /* bit number in the word */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t block; /* bitmap block number */ int bit; /* bit number in the word */
struct xfs_buf *bp; /* buf for the block */ xfs_fileoff_t block; /* bitmap block number */
int error; /* error value */ struct xfs_buf *bp; /* buf for the block */
xfs_rtxnum_t i; /* current bit number rel. to start */ int error;
xfs_rtxnum_t lastbit; /* last useful bit in word */ xfs_rtxnum_t i; /* current bit number rel. to start */
xfs_rtword_t mask; /* mask of relevant bits for value */ xfs_rtxnum_t lastbit; /* last useful bit in word */
xfs_rtword_t wdiff; /* difference from wanted value */ xfs_rtword_t mask; /* mask of relevant bits for value */
xfs_rtword_t incore; xfs_rtword_t wdiff; /* difference from wanted value */
unsigned int word; /* word number in the buffer */ xfs_rtword_t incore;
unsigned int word; /* word number in the buffer */
/* /*
* Compute starting bitmap block number * Compute starting bitmap block number
@@ -788,7 +787,7 @@ xfs_rtcheck_range(
/* /*
* Read the bitmap block. * Read the bitmap block.
*/ */
error = xfs_rtbuf_get(mp, tp, block, 0, &bp); error = xfs_rtbuf_get(args, block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -823,7 +822,7 @@ xfs_rtcheck_range(
/* /*
* Different, compute first wrong bit and return. * Different, compute first wrong bit and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i = XFS_RTLOBIT(wdiff) - bit; i = XFS_RTLOBIT(wdiff) - bit;
*new = start + i; *new = start + i;
*stat = 0; *stat = 0;
@@ -838,8 +837,8 @@ xfs_rtcheck_range(
/* /*
* If done with this block, get the next one. * If done with this block, get the next one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -865,7 +864,7 @@ xfs_rtcheck_range(
/* /*
* Different, compute first wrong bit and return. * Different, compute first wrong bit and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_RTLOBIT(wdiff); i += XFS_RTLOBIT(wdiff);
*new = start + i; *new = start + i;
*stat = 0; *stat = 0;
@@ -880,8 +879,8 @@ xfs_rtcheck_range(
/* /*
* If done with this block, get the next one. * If done with this block, get the next one.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
error = xfs_rtbuf_get(mp, tp, ++block, 0, &bp); error = xfs_rtbuf_get(args, ++block, 0, &bp);
if (error) { if (error) {
return error; return error;
} }
@@ -906,7 +905,7 @@ xfs_rtcheck_range(
/* /*
* Different, compute first wrong bit and return. * Different, compute first wrong bit and return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
i += XFS_RTLOBIT(wdiff); i += XFS_RTLOBIT(wdiff);
*new = start + i; *new = start + i;
*stat = 0; *stat = 0;
@@ -917,7 +916,7 @@ xfs_rtcheck_range(
/* /*
* Successful, return. * Successful, return.
*/ */
xfs_trans_brelse(tp, bp); xfs_trans_brelse(args->tp, bp);
*new = start + i; *new = start + i;
*stat = 1; *stat = 1;
return 0; return 0;
@@ -927,54 +926,55 @@ xfs_rtcheck_range(
/* /*
* Check that the given extent (block range) is allocated already. * Check that the given extent (block range) is allocated already.
*/ */
STATIC int /* error */ STATIC int
xfs_rtcheck_alloc_range( xfs_rtcheck_alloc_range(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext number of extent */
xfs_rtxnum_t start, /* starting rtext number of extent */ xfs_rtxlen_t len) /* length of extent */
xfs_rtxlen_t len) /* length of extent */
{ {
xfs_rtxnum_t new; /* dummy for xfs_rtcheck_range */ xfs_rtxnum_t new; /* dummy for xfs_rtcheck_range */
int stat; int stat;
int error; int error;
error = xfs_rtcheck_range(mp, tp, start, len, 0, &new, &stat); error = xfs_rtcheck_range(args, start, len, 0, &new, &stat);
if (error) if (error)
return error; return error;
ASSERT(stat); ASSERT(stat);
return 0; return 0;
} }
#else #else
#define xfs_rtcheck_alloc_range(m,t,b,l) (0) #define xfs_rtcheck_alloc_range(a,b,l) (0)
#endif #endif
/* /*
* Free an extent in the realtime subvolume. Length is expressed in * Free an extent in the realtime subvolume. Length is expressed in
* realtime extents, as is the block number. * realtime extents, as is the block number.
*/ */
int /* error */ int
xfs_rtfree_extent( xfs_rtfree_extent(
xfs_trans_t *tp, /* transaction pointer */ struct xfs_trans *tp, /* transaction pointer */
xfs_rtxnum_t start, /* starting rtext number to free */ xfs_rtxnum_t start, /* starting rtext number to free */
xfs_rtxlen_t len) /* length of extent freed */ xfs_rtxlen_t len) /* length of extent freed */
{ {
int error; /* error value */ struct xfs_mount *mp = tp->t_mountp;
xfs_mount_t *mp; /* file system mount structure */ struct xfs_rtalloc_args args = {
xfs_fsblock_t sb; /* summary file block number */ .mp = mp,
struct xfs_buf *sumbp = NULL; /* summary file block buffer */ .tp = tp,
};
mp = tp->t_mountp; int error;
xfs_fsblock_t sb; /* summary file block number */
struct xfs_buf *sumbp = NULL; /* summary file block buffer */
ASSERT(mp->m_rbmip->i_itemp != NULL); ASSERT(mp->m_rbmip->i_itemp != NULL);
ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));
error = xfs_rtcheck_alloc_range(mp, tp, start, len); error = xfs_rtcheck_alloc_range(&args, start, len);
if (error) if (error)
return error; return error;
/* /*
* Free the range of realtime blocks. * Free the range of realtime blocks.
*/ */
error = xfs_rtfree_range(mp, tp, start, len, &sumbp, &sb); error = xfs_rtfree_range(&args, start, len, &sumbp, &sb);
if (error) { if (error) {
return error; return error;
} }
@@ -1039,6 +1039,10 @@ xfs_rtalloc_query_range(
xfs_rtalloc_query_range_fn fn, xfs_rtalloc_query_range_fn fn,
void *priv) void *priv)
{ {
struct xfs_rtalloc_args args = {
.mp = mp,
.tp = tp,
};
struct xfs_rtalloc_rec rec; struct xfs_rtalloc_rec rec;
xfs_rtxnum_t rtstart; xfs_rtxnum_t rtstart;
xfs_rtxnum_t rtend; xfs_rtxnum_t rtend;
@@ -1058,13 +1062,13 @@ xfs_rtalloc_query_range(
rtstart = low_rec->ar_startext; rtstart = low_rec->ar_startext;
while (rtstart <= high_key) { while (rtstart <= high_key) {
/* Is the first block free? */ /* Is the first block free? */
error = xfs_rtcheck_range(mp, tp, rtstart, 1, 1, &rtend, error = xfs_rtcheck_range(&args, rtstart, 1, 1, &rtend,
&is_free); &is_free);
if (error) if (error)
break; break;
/* How long does the extent go for? */ /* How long does the extent go for? */
error = xfs_rtfind_forw(mp, tp, rtstart, high_key, &rtend); error = xfs_rtfind_forw(&args, rtstart, high_key, &rtend);
if (error) if (error)
break; break;
@@ -1109,11 +1113,15 @@ xfs_rtalloc_extent_is_free(
xfs_rtxlen_t len, xfs_rtxlen_t len,
bool *is_free) bool *is_free)
{ {
struct xfs_rtalloc_args args = {
.mp = mp,
.tp = tp,
};
xfs_rtxnum_t end; xfs_rtxnum_t end;
int matches; int matches;
int error; int error;
error = xfs_rtcheck_range(mp, tp, start, len, 1, &end, &matches); error = xfs_rtcheck_range(&args, start, len, 1, &end, &matches);
if (error) if (error)
return error; return error;

46
fs/xfs/libxfs/xfs_rtbitmap.h
View File

@@ -6,6 +6,11 @@
#ifndef __XFS_RTBITMAP_H__ #ifndef __XFS_RTBITMAP_H__
#define __XFS_RTBITMAP_H__ #define __XFS_RTBITMAP_H__
struct xfs_rtalloc_args {
struct xfs_mount *mp;
struct xfs_trans *tp;
};
static inline xfs_rtblock_t static inline xfs_rtblock_t
xfs_rtx_to_rtb( xfs_rtx_to_rtb(
struct xfs_mount *mp, struct xfs_mount *mp,
@@ -281,29 +286,24 @@ typedef int (*xfs_rtalloc_query_range_fn)(
void *priv); void *priv);
#ifdef CONFIG_XFS_RT #ifdef CONFIG_XFS_RT
int xfs_rtbuf_get(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_rtbuf_get(struct xfs_rtalloc_args *args, xfs_fileoff_t block,
xfs_fileoff_t block, int issum, struct xfs_buf **bpp); int issum, struct xfs_buf **bpp);
int xfs_rtcheck_range(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_rtcheck_range(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
xfs_rtxnum_t start, xfs_rtxlen_t len, int val, xfs_rtxlen_t len, int val, xfs_rtxnum_t *new, int *stat);
xfs_rtxnum_t *new, int *stat); int xfs_rtfind_back(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
int xfs_rtfind_back(struct xfs_mount *mp, struct xfs_trans *tp, xfs_rtxnum_t limit, xfs_rtxnum_t *rtblock);
xfs_rtxnum_t start, xfs_rtxnum_t limit, int xfs_rtfind_forw(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
xfs_rtxnum_t *rtblock); xfs_rtxnum_t limit, xfs_rtxnum_t *rtblock);
int xfs_rtfind_forw(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_rtmodify_range(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
xfs_rtxnum_t start, xfs_rtxnum_t limit, xfs_rtxlen_t len, int val);
xfs_rtxnum_t *rtblock); int xfs_rtmodify_summary_int(struct xfs_rtalloc_args *args, int log,
int xfs_rtmodify_range(struct xfs_mount *mp, struct xfs_trans *tp, xfs_fileoff_t bbno, int delta, struct xfs_buf **rbpp,
xfs_rtxnum_t start, xfs_rtxlen_t len, int val); xfs_fileoff_t *rsb, xfs_suminfo_t *sum);
int xfs_rtmodify_summary_int(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_rtmodify_summary(struct xfs_rtalloc_args *args, int log,
int log, xfs_fileoff_t bbno, int delta, xfs_fileoff_t bbno, int delta, struct xfs_buf **rbpp,
struct xfs_buf **rbpp, xfs_fileoff_t *rsb, xfs_fileoff_t *rsb);
xfs_suminfo_t *sum); int xfs_rtfree_range(struct xfs_rtalloc_args *args, xfs_rtxnum_t start,
int xfs_rtmodify_summary(struct xfs_mount *mp, struct xfs_trans *tp, int log, xfs_rtxlen_t len, struct xfs_buf **rbpp, xfs_fileoff_t *rsb);
xfs_fileoff_t bbno, int delta, struct xfs_buf **rbpp,
xfs_fileoff_t *rsb);
int xfs_rtfree_range(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_rtxnum_t start, xfs_rtxlen_t len,
struct xfs_buf **rbpp, xfs_fileoff_t *rsb);
int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp, int xfs_rtalloc_query_range(struct xfs_mount *mp, struct xfs_trans *tp,
const struct xfs_rtalloc_rec *low_rec, const struct xfs_rtalloc_rec *low_rec,
const struct xfs_rtalloc_rec *high_rec, const struct xfs_rtalloc_rec *high_rec,

6
fs/xfs/scrub/rtsummary.c
View File

@@ -188,6 +188,10 @@ STATIC int
xchk_rtsum_compare( xchk_rtsum_compare(
struct xfs_scrub *sc) struct xfs_scrub *sc)
{ {
struct xfs_rtalloc_args args = {
.mp = sc->mp,
.tp = sc->tp,
};
struct xfs_mount *mp = sc->mp; struct xfs_mount *mp = sc->mp;
struct xfs_buf *bp; struct xfs_buf *bp;
struct xfs_bmbt_irec map; struct xfs_bmbt_irec map;
@@ -217,7 +221,7 @@ xchk_rtsum_compare(
} }
/* Read a block's worth of ondisk rtsummary file. */ /* Read a block's worth of ondisk rtsummary file. */
error = xfs_rtbuf_get(mp, sc->tp, off, 1, &bp); error = xfs_rtbuf_get(&args, off, 1, &bp);
if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, off, &error)) if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, off, &error))
return error; return error;

333
fs/xfs/xfs_rtalloc.c
View File

@@ -29,35 +29,34 @@
*/ */
static int static int
xfs_rtget_summary( xfs_rtget_summary(
xfs_mount_t *mp, /* file system mount structure */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ int log, /* log2 of extent size */
int log, /* log2 of extent size */ xfs_fileoff_t bbno, /* bitmap block number */
xfs_fileoff_t bbno, /* bitmap block number */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_suminfo_t *sum) /* out: summary info for this block */
xfs_suminfo_t *sum) /* out: summary info for this block */
{ {
return xfs_rtmodify_summary_int(mp, tp, log, bbno, 0, rbpp, rsb, sum); return xfs_rtmodify_summary_int(args, log, bbno, 0, rbpp, rsb, sum);
} }
/* /*
* Return whether there are any free extents in the size range given * Return whether there are any free extents in the size range given
* by low and high, for the bitmap block bbno. * by low and high, for the bitmap block bbno.
*/ */
STATIC int /* error */ STATIC int
xfs_rtany_summary( xfs_rtany_summary(
xfs_mount_t *mp, /* file system mount structure */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ int low, /* low log2 extent size */
int low, /* low log2 extent size */ int high, /* high log2 extent size */
int high, /* high log2 extent size */ xfs_fileoff_t bbno, /* bitmap block number */
xfs_fileoff_t bbno, /* bitmap block number */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ int *stat) /* out: any good extents here? */
int *stat) /* out: any good extents here? */
{ {
int error; /* error value */ struct xfs_mount *mp = args->mp;
int log; /* loop counter, log2 of ext. size */ int error;
xfs_suminfo_t sum; /* summary data */ int log; /* loop counter, log2 of ext. size */
xfs_suminfo_t sum; /* summary data */
/* There are no extents at levels < m_rsum_cache[bbno]. */ /* There are no extents at levels < m_rsum_cache[bbno]. */
if (mp->m_rsum_cache && low < mp->m_rsum_cache[bbno]) if (mp->m_rsum_cache && low < mp->m_rsum_cache[bbno])
@@ -70,7 +69,7 @@ xfs_rtany_summary(
/* /*
* Get one summary datum. * Get one summary datum.
*/ */
error = xfs_rtget_summary(mp, tp, log, bbno, rbpp, rsb, &sum); error = xfs_rtget_summary(args, log, bbno, rbpp, rsb, &sum);
if (error) { if (error) {
return error; return error;
} }
@@ -98,35 +97,34 @@ out:
* Copy and transform the summary file, given the old and new * Copy and transform the summary file, given the old and new
* parameters in the mount structures. * parameters in the mount structures.
*/ */
STATIC int /* error */ STATIC int
xfs_rtcopy_summary( xfs_rtcopy_summary(
xfs_mount_t *omp, /* old file system mount point */ struct xfs_rtalloc_args *oargs,
xfs_mount_t *nmp, /* new file system mount point */ struct xfs_rtalloc_args *nargs)
xfs_trans_t *tp) /* transaction pointer */
{ {
xfs_fileoff_t bbno; /* bitmap block number */ xfs_fileoff_t bbno; /* bitmap block number */
struct xfs_buf *bp; /* summary buffer */ struct xfs_buf *bp; /* summary buffer */
int error; /* error return value */ int error;
int log; /* summary level number (log length) */ int log; /* summary level number (log length) */
xfs_suminfo_t sum; /* summary data */ xfs_suminfo_t sum; /* summary data */
xfs_fileoff_t sumbno; /* summary block number */ xfs_fileoff_t sumbno; /* summary block number */
bp = NULL; bp = NULL;
for (log = omp->m_rsumlevels - 1; log >= 0; log--) { for (log = oargs->mp->m_rsumlevels - 1; log >= 0; log--) {
for (bbno = omp->m_sb.sb_rbmblocks - 1; for (bbno = oargs->mp->m_sb.sb_rbmblocks - 1;
(xfs_srtblock_t)bbno >= 0; (xfs_srtblock_t)bbno >= 0;
bbno--) { bbno--) {
error = xfs_rtget_summary(omp, tp, log, bbno, &bp, error = xfs_rtget_summary(oargs, log, bbno, &bp,
&sumbno, &sum); &sumbno, &sum);
if (error) if (error)
return error; return error;
if (sum == 0) if (sum == 0)
continue; continue;
error = xfs_rtmodify_summary(omp, tp, log, bbno, -sum, error = xfs_rtmodify_summary(oargs, log, bbno, -sum,
&bp, &sumbno); &bp, &sumbno);
if (error) if (error)
return error; return error;
error = xfs_rtmodify_summary(nmp, tp, log, bbno, sum, error = xfs_rtmodify_summary(nargs, log, bbno, sum,
&bp, &sumbno); &bp, &sumbno);
if (error) if (error)
return error; return error;
@@ -139,19 +137,19 @@ xfs_rtcopy_summary(
* Mark an extent specified by start and len allocated. * Mark an extent specified by start and len allocated.
* Updates all the summary information as well as the bitmap. * Updates all the summary information as well as the bitmap.
*/ */
STATIC int /* error */ STATIC int
xfs_rtallocate_range( xfs_rtallocate_range(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* start rtext to allocate */
xfs_rtxnum_t start, /* start rtext to allocate */ xfs_rtxlen_t len, /* length to allocate */
xfs_rtxlen_t len, /* length to allocate */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb) /* in/out: summary block number */
xfs_fileoff_t *rsb) /* in/out: summary block number */
{ {
xfs_rtxnum_t end; /* end of the allocated rtext */ struct xfs_mount *mp = args->mp;
int error; /* error value */ xfs_rtxnum_t end; /* end of the allocated rtext */
xfs_rtxnum_t postblock = 0; /* first rtext allocated > end */ int error;
xfs_rtxnum_t preblock = 0; /* first rtext allocated < start */ xfs_rtxnum_t postblock = 0; /* first rtext allocated > end */
xfs_rtxnum_t preblock = 0; /* first rtext allocated < start */
end = start + len - 1; end = start + len - 1;
/* /*
@@ -159,14 +157,14 @@ xfs_rtallocate_range(
* We need to find the beginning and end of the extent so we can * We need to find the beginning and end of the extent so we can
* properly update the summary. * properly update the summary.
*/ */
error = xfs_rtfind_back(mp, tp, start, 0, &preblock); error = xfs_rtfind_back(args, start, 0, &preblock);
if (error) { if (error) {
return error; return error;
} }
/* /*
* Find the next allocated block (end of free extent). * Find the next allocated block (end of free extent).
*/ */
error = xfs_rtfind_forw(mp, tp, end, mp->m_sb.sb_rextents - 1, error = xfs_rtfind_forw(args, end, mp->m_sb.sb_rextents - 1,
&postblock); &postblock);
if (error) { if (error) {
return error; return error;
@@ -175,7 +173,7 @@ xfs_rtallocate_range(
* Decrement the summary information corresponding to the entire * Decrement the summary information corresponding to the entire
* (old) free extent. * (old) free extent.
*/ */
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(postblock + 1 - preblock), XFS_RTBLOCKLOG(postblock + 1 - preblock),
xfs_rtx_to_rbmblock(mp, preblock), -1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, preblock), -1, rbpp, rsb);
if (error) { if (error) {
@@ -186,7 +184,7 @@ xfs_rtallocate_range(
* old extent, add summary data for them to be free. * old extent, add summary data for them to be free.
*/ */
if (preblock < start) { if (preblock < start) {
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(start - preblock), XFS_RTBLOCKLOG(start - preblock),
xfs_rtx_to_rbmblock(mp, preblock), 1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, preblock), 1, rbpp, rsb);
if (error) { if (error) {
@@ -198,7 +196,7 @@ xfs_rtallocate_range(
* old extent, add summary data for them to be free. * old extent, add summary data for them to be free.
*/ */
if (postblock > end) { if (postblock > end) {
error = xfs_rtmodify_summary(mp, tp, error = xfs_rtmodify_summary(args,
XFS_RTBLOCKLOG(postblock - end), XFS_RTBLOCKLOG(postblock - end),
xfs_rtx_to_rbmblock(mp, end + 1), 1, rbpp, rsb); xfs_rtx_to_rbmblock(mp, end + 1), 1, rbpp, rsb);
if (error) { if (error) {
@@ -208,7 +206,7 @@ xfs_rtallocate_range(
/* /*
* Modify the bitmap to mark this extent allocated. * Modify the bitmap to mark this extent allocated.
*/ */
error = xfs_rtmodify_range(mp, tp, start, len, 0); error = xfs_rtmodify_range(args, start, len, 0);
return error; return error;
} }
@@ -235,27 +233,27 @@ xfs_rtallocate_clamp_len(
* the length, if given. Returns error; returns starting block in *rtx. * the length, if given. Returns error; returns starting block in *rtx.
* The lengths are all in rtextents. * The lengths are all in rtextents.
*/ */
STATIC int /* error */ STATIC int
xfs_rtallocate_extent_block( xfs_rtallocate_extent_block(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_fileoff_t bbno, /* bitmap block number */
xfs_fileoff_t bbno, /* bitmap block number */ xfs_rtxlen_t minlen, /* minimum length to allocate */
xfs_rtxlen_t minlen, /* minimum length to allocate */ xfs_rtxlen_t maxlen, /* maximum length to allocate */
xfs_rtxlen_t maxlen, /* maximum length to allocate */ xfs_rtxlen_t *len, /* out: actual length allocated */
xfs_rtxlen_t *len, /* out: actual length allocated */ xfs_rtxnum_t *nextp, /* out: next rtext to try */
xfs_rtxnum_t *nextp, /* out: next rtext to try */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_rtxlen_t prod, /* extent product factor */
xfs_rtxlen_t prod, /* extent product factor */ xfs_rtxnum_t *rtx) /* out: start rtext allocated */
xfs_rtxnum_t *rtx) /* out: start rtext allocated */
{ {
xfs_rtxnum_t besti; /* best rtext found so far */ struct xfs_mount *mp = args->mp;
xfs_rtxnum_t bestlen; /* best length found so far */ xfs_rtxnum_t besti; /* best rtext found so far */
xfs_rtxnum_t end; /* last rtext in chunk */ xfs_rtxnum_t bestlen;/* best length found so far */
int error; /* error value */ xfs_rtxnum_t end; /* last rtext in chunk */
xfs_rtxnum_t i; /* current rtext trying */ int error;
xfs_rtxnum_t next; /* next rtext to try */ xfs_rtxnum_t i; /* current rtext trying */
int stat; /* status from internal calls */ xfs_rtxnum_t next; /* next rtext to try */
int stat; /* status from internal calls */
/* /*
* Loop over all the extents starting in this bitmap block, * Loop over all the extents starting in this bitmap block,
@@ -272,7 +270,7 @@ xfs_rtallocate_extent_block(
* See if there's a free extent of maxlen starting at i. * See if there's a free extent of maxlen starting at i.
* If it's not so then next will contain the first non-free. * If it's not so then next will contain the first non-free.
*/ */
error = xfs_rtcheck_range(mp, tp, i, maxlen, 1, &next, &stat); error = xfs_rtcheck_range(args, i, maxlen, 1, &next, &stat);
if (error) { if (error) {
return error; return error;
} }
@@ -280,7 +278,7 @@ xfs_rtallocate_extent_block(
/* /*
* i for maxlen is all free, allocate and return that. * i for maxlen is all free, allocate and return that.
*/ */
error = xfs_rtallocate_range(mp, tp, i, maxlen, rbpp, error = xfs_rtallocate_range(args, i, maxlen, rbpp,
rsb); rsb);
if (error) { if (error) {
return error; return error;
@@ -308,7 +306,7 @@ xfs_rtallocate_extent_block(
* If not done yet, find the start of the next free space. * If not done yet, find the start of the next free space.
*/ */
if (next < end) { if (next < end) {
error = xfs_rtfind_forw(mp, tp, next, end, &i); error = xfs_rtfind_forw(args, next, end, &i);
if (error) { if (error) {
return error; return error;
} }
@@ -333,7 +331,7 @@ xfs_rtallocate_extent_block(
/* /*
* Allocate besti for bestlen & return that. * Allocate besti for bestlen & return that.
*/ */
error = xfs_rtallocate_range(mp, tp, besti, bestlen, rbpp, rsb); error = xfs_rtallocate_range(args, besti, bestlen, rbpp, rsb);
if (error) { if (error) {
return error; return error;
} }
@@ -355,30 +353,29 @@ xfs_rtallocate_extent_block(
* Returns error; returns starting block in *rtx. * Returns error; returns starting block in *rtx.
* The lengths are all in rtextents. * The lengths are all in rtextents.
*/ */
STATIC int /* error */ STATIC int
xfs_rtallocate_extent_exact( xfs_rtallocate_extent_exact(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext number to allocate */
xfs_rtxnum_t start, /* starting rtext number to allocate */ xfs_rtxlen_t minlen, /* minimum length to allocate */
xfs_rtxlen_t minlen, /* minimum length to allocate */ xfs_rtxlen_t maxlen, /* maximum length to allocate */
xfs_rtxlen_t maxlen, /* maximum length to allocate */ xfs_rtxlen_t *len, /* out: actual length allocated */
xfs_rtxlen_t *len, /* out: actual length allocated */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_rtxlen_t prod, /* extent product factor */
xfs_rtxlen_t prod, /* extent product factor */ xfs_rtxnum_t *rtx) /* out: start rtext allocated */
xfs_rtxnum_t *rtx) /* out: start rtext allocated */
{ {
int error; /* error value */ int error;
xfs_rtxlen_t i; /* extent length trimmed due to prod */ xfs_rtxlen_t i; /* extent length trimmed due to prod */
int isfree; /* extent is free */ int isfree; /* extent is free */
xfs_rtxnum_t next; /* next rtext to try (dummy) */ xfs_rtxnum_t next; /* next rtext to try (dummy) */
ASSERT(minlen % prod == 0); ASSERT(minlen % prod == 0);
ASSERT(maxlen % prod == 0); ASSERT(maxlen % prod == 0);
/* /*
* Check if the range in question (for maxlen) is free. * Check if the range in question (for maxlen) is free.
*/ */
error = xfs_rtcheck_range(mp, tp, start, maxlen, 1, &next, &isfree); error = xfs_rtcheck_range(args, start, maxlen, 1, &next, &isfree);
if (error) { if (error) {
return error; return error;
} }
@@ -386,7 +383,7 @@ xfs_rtallocate_extent_exact(
/* /*
* If it is, allocate it and return success. * If it is, allocate it and return success.
*/ */
error = xfs_rtallocate_range(mp, tp, start, maxlen, rbpp, rsb); error = xfs_rtallocate_range(args, start, maxlen, rbpp, rsb);
if (error) { if (error) {
return error; return error;
} }
@@ -421,7 +418,7 @@ xfs_rtallocate_extent_exact(
/* /*
* Allocate what we can and return it. * Allocate what we can and return it.
*/ */
error = xfs_rtallocate_range(mp, tp, start, maxlen, rbpp, rsb); error = xfs_rtallocate_range(args, start, maxlen, rbpp, rsb);
if (error) { if (error) {
return error; return error;
} }
@@ -435,27 +432,27 @@ xfs_rtallocate_extent_exact(
* to start as possible. If we don't get maxlen then use prod to trim * to start as possible. If we don't get maxlen then use prod to trim
* the length, if given. The lengths are all in rtextents. * the length, if given. The lengths are all in rtextents.
*/ */
STATIC int /* error */ STATIC int
xfs_rtallocate_extent_near( xfs_rtallocate_extent_near(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxnum_t start, /* starting rtext number to allocate */
xfs_rtxnum_t start, /* starting rtext number to allocate */ xfs_rtxlen_t minlen, /* minimum length to allocate */
xfs_rtxlen_t minlen, /* minimum length to allocate */ xfs_rtxlen_t maxlen, /* maximum length to allocate */
xfs_rtxlen_t maxlen, /* maximum length to allocate */ xfs_rtxlen_t *len, /* out: actual length allocated */
xfs_rtxlen_t *len, /* out: actual length allocated */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_rtxlen_t prod, /* extent product factor */
xfs_rtxlen_t prod, /* extent product factor */ xfs_rtxnum_t *rtx) /* out: start rtext allocated */
xfs_rtxnum_t *rtx) /* out: start rtext allocated */
{ {
int any; /* any useful extents from summary */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t bbno; /* bitmap block number */ int any; /* any useful extents from summary */
int error; /* error value */ xfs_fileoff_t bbno; /* bitmap block number */
int i; /* bitmap block offset (loop control) */ int error;
int j; /* secondary loop control */ int i; /* bitmap block offset (loop control) */
int log2len; /* log2 of minlen */ int j; /* secondary loop control */
xfs_rtxnum_t n; /* next rtext to try */ int log2len; /* log2 of minlen */
xfs_rtxnum_t r; /* result rtext */ xfs_rtxnum_t n; /* next rtext to try */
xfs_rtxnum_t r; /* result rtext */
ASSERT(minlen % prod == 0); ASSERT(minlen % prod == 0);
ASSERT(maxlen % prod == 0); ASSERT(maxlen % prod == 0);
@@ -477,8 +474,8 @@ xfs_rtallocate_extent_near(
/* /*
* Try the exact allocation first. * Try the exact allocation first.
*/ */
error = xfs_rtallocate_extent_exact(mp, tp, start, minlen, maxlen, len, error = xfs_rtallocate_extent_exact(args, start, minlen, maxlen, len,
rbpp, rsb, prod, &r); rbpp, rsb, prod, &r);
if (error) { if (error) {
return error; return error;
} }
@@ -501,7 +498,7 @@ xfs_rtallocate_extent_near(
* Get summary information of extents of all useful levels * Get summary information of extents of all useful levels
* starting in this bitmap block. * starting in this bitmap block.
*/ */
error = xfs_rtany_summary(mp, tp, log2len, mp->m_rsumlevels - 1, error = xfs_rtany_summary(args, log2len, mp->m_rsumlevels - 1,
bbno + i, rbpp, rsb, &any); bbno + i, rbpp, rsb, &any);
if (error) { if (error) {
return error; return error;
@@ -519,7 +516,7 @@ xfs_rtallocate_extent_near(
* Try to allocate an extent starting in * Try to allocate an extent starting in
* this block. * this block.
*/ */
error = xfs_rtallocate_extent_block(mp, tp, error = xfs_rtallocate_extent_block(args,
bbno + i, minlen, maxlen, len, &n, rbpp, bbno + i, minlen, maxlen, len, &n, rbpp,
rsb, prod, &r); rsb, prod, &r);
if (error) { if (error) {
@@ -548,7 +545,7 @@ xfs_rtallocate_extent_near(
* Grab the summary information for * Grab the summary information for
* this bitmap block. * this bitmap block.
*/ */
error = xfs_rtany_summary(mp, tp, error = xfs_rtany_summary(args,
log2len, mp->m_rsumlevels - 1, log2len, mp->m_rsumlevels - 1,
bbno + j, rbpp, rsb, &any); bbno + j, rbpp, rsb, &any);
if (error) { if (error) {
@@ -564,8 +561,8 @@ xfs_rtallocate_extent_near(
*/ */
if (any) if (any)
continue; continue;
error = xfs_rtallocate_extent_block(mp, error = xfs_rtallocate_extent_block(args,
tp, bbno + j, minlen, maxlen, bbno + j, minlen, maxlen,
len, &n, rbpp, rsb, prod, &r); len, &n, rbpp, rsb, prod, &r);
if (error) { if (error) {
return error; return error;
@@ -586,7 +583,7 @@ xfs_rtallocate_extent_near(
* Try to allocate from the summary block * Try to allocate from the summary block
* that we found. * that we found.
*/ */
error = xfs_rtallocate_extent_block(mp, tp, error = xfs_rtallocate_extent_block(args,
bbno + i, minlen, maxlen, len, &n, rbpp, bbno + i, minlen, maxlen, len, &n, rbpp,
rsb, prod, &r); rsb, prod, &r);
if (error) { if (error) {
@@ -640,24 +637,24 @@ xfs_rtallocate_extent_near(
* specified. If we don't get maxlen then use prod to trim * specified. If we don't get maxlen then use prod to trim
* the length, if given. The lengths are all in rtextents. * the length, if given. The lengths are all in rtextents.
*/ */
STATIC int /* error */ STATIC int
xfs_rtallocate_extent_size( xfs_rtallocate_extent_size(
xfs_mount_t *mp, /* file system mount point */ struct xfs_rtalloc_args *args,
xfs_trans_t *tp, /* transaction pointer */ xfs_rtxlen_t minlen, /* minimum length to allocate */
xfs_rtxlen_t minlen, /* minimum length to allocate */ xfs_rtxlen_t maxlen, /* maximum length to allocate */
xfs_rtxlen_t maxlen, /* maximum length to allocate */ xfs_rtxlen_t *len, /* out: actual length allocated */
xfs_rtxlen_t *len, /* out: actual length allocated */ struct xfs_buf **rbpp, /* in/out: summary block buffer */
struct xfs_buf **rbpp, /* in/out: summary block buffer */ xfs_fileoff_t *rsb, /* in/out: summary block number */
xfs_fileoff_t *rsb, /* in/out: summary block number */ xfs_rtxlen_t prod, /* extent product factor */
xfs_rtxlen_t prod, /* extent product factor */ xfs_rtxnum_t *rtx) /* out: start rtext allocated */
xfs_rtxnum_t *rtx) /* out: start rtext allocated */
{ {
int error; /* error value */ struct xfs_mount *mp = args->mp;
xfs_fileoff_t i; /* bitmap block number */ int error;
int l; /* level number (loop control) */ xfs_fileoff_t i; /* bitmap block number */
xfs_rtxnum_t n; /* next rtext to be tried */ int l; /* level number (loop control) */
xfs_rtxnum_t r; /* result rtext number */ xfs_rtxnum_t n; /* next rtext to be tried */
xfs_suminfo_t sum; /* summary information for extents */ xfs_rtxnum_t r; /* result rtext number */
xfs_suminfo_t sum; /* summary information for extents */
ASSERT(minlen % prod == 0); ASSERT(minlen % prod == 0);
ASSERT(maxlen % prod == 0); ASSERT(maxlen % prod == 0);
@@ -678,7 +675,7 @@ xfs_rtallocate_extent_size(
/* /*
* Get the summary for this level/block. * Get the summary for this level/block.
*/ */
error = xfs_rtget_summary(mp, tp, l, i, rbpp, rsb, error = xfs_rtget_summary(args, l, i, rbpp, rsb,
&sum); &sum);
if (error) { if (error) {
return error; return error;
@@ -691,7 +688,7 @@ xfs_rtallocate_extent_size(
/* /*
* Try allocating the extent. * Try allocating the extent.
*/ */
error = xfs_rtallocate_extent_block(mp, tp, i, maxlen, error = xfs_rtallocate_extent_block(args, i, maxlen,
maxlen, len, &n, rbpp, rsb, prod, &r); maxlen, len, &n, rbpp, rsb, prod, &r);
if (error) { if (error) {
return error; return error;
@@ -737,7 +734,7 @@ xfs_rtallocate_extent_size(
/* /*
* Get the summary information for this level/block. * Get the summary information for this level/block.
*/ */
error = xfs_rtget_summary(mp, tp, l, i, rbpp, rsb, error = xfs_rtget_summary(args, l, i, rbpp, rsb,
&sum); &sum);
if (error) { if (error) {
return error; return error;
@@ -752,7 +749,7 @@ xfs_rtallocate_extent_size(
* minlen/maxlen are in the possible range for * minlen/maxlen are in the possible range for
* this summary level. * this summary level.
*/ */
error = xfs_rtallocate_extent_block(mp, tp, i, error = xfs_rtallocate_extent_block(args, i,
XFS_RTMAX(minlen, 1 << l), XFS_RTMAX(minlen, 1 << l),
XFS_RTMIN(maxlen, (1 << (l + 1)) - 1), XFS_RTMIN(maxlen, (1 << (l + 1)) - 1),
len, &n, rbpp, rsb, prod, &r); len, &n, rbpp, rsb, prod, &r);
@@ -1044,6 +1041,12 @@ xfs_growfs_rt(
((sbp->sb_rextents & ((1 << mp->m_blkbit_log) - 1)) != 0); ((sbp->sb_rextents & ((1 << mp->m_blkbit_log) - 1)) != 0);
bmbno < nrbmblocks; bmbno < nrbmblocks;
bmbno++) { bmbno++) {
struct xfs_rtalloc_args args = {
.mp = mp,
};
struct xfs_rtalloc_args nargs = {
.mp = nmp,
};
struct xfs_trans *tp; struct xfs_trans *tp;
xfs_rfsblock_t nrblocks_step; xfs_rfsblock_t nrblocks_step;
@@ -1072,6 +1075,9 @@ xfs_growfs_rt(
&tp); &tp);
if (error) if (error)
break; break;
args.tp = tp;
nargs.tp = tp;
/* /*
* Lock out other callers by grabbing the bitmap inode lock. * Lock out other callers by grabbing the bitmap inode lock.
*/ */
@@ -1105,7 +1111,7 @@ xfs_growfs_rt(
*/ */
if (sbp->sb_rbmblocks != nsbp->sb_rbmblocks || if (sbp->sb_rbmblocks != nsbp->sb_rbmblocks ||
mp->m_rsumlevels != nmp->m_rsumlevels) { mp->m_rsumlevels != nmp->m_rsumlevels) {
error = xfs_rtcopy_summary(mp, nmp, tp); error = xfs_rtcopy_summary(&args, &nargs);
if (error) if (error)
goto error_cancel; goto error_cancel;
} }
@@ -1131,7 +1137,7 @@ xfs_growfs_rt(
* Free new extent. * Free new extent.
*/ */
bp = NULL; bp = NULL;
error = xfs_rtfree_range(nmp, tp, sbp->sb_rextents, error = xfs_rtfree_range(&nargs, sbp->sb_rextents,
nsbp->sb_rextents - sbp->sb_rextents, &bp, &sumbno); nsbp->sb_rextents - sbp->sb_rextents, &bp, &sumbno);
if (error) { if (error) {
error_cancel: error_cancel:
@@ -1190,24 +1196,27 @@ out_free:
* parameters. The length units are all in realtime extents, as is the * parameters. The length units are all in realtime extents, as is the
* result block number. * result block number.
*/ */
int /* error */ int
xfs_rtallocate_extent( xfs_rtallocate_extent(
xfs_trans_t *tp, /* transaction pointer */ struct xfs_trans *tp,
xfs_rtxnum_t start, /* starting rtext number to allocate */ xfs_rtxnum_t start, /* starting rtext number to allocate */
xfs_rtxlen_t minlen, /* minimum length to allocate */ xfs_rtxlen_t minlen, /* minimum length to allocate */
xfs_rtxlen_t maxlen, /* maximum length to allocate */ xfs_rtxlen_t maxlen, /* maximum length to allocate */
xfs_rtxlen_t *len, /* out: actual length allocated */ xfs_rtxlen_t *len, /* out: actual length allocated */
int wasdel, /* was a delayed allocation extent */ int wasdel, /* was a delayed allocation extent */
xfs_rtxlen_t prod, /* extent product factor */ xfs_rtxlen_t prod, /* extent product factor */
xfs_rtxnum_t *rtblock) /* out: start rtext allocated */ xfs_rtxnum_t *rtblock) /* out: start rtext allocated */
{ {
xfs_mount_t *mp = tp->t_mountp; struct xfs_rtalloc_args args = {
int error; /* error value */ .mp = tp->t_mountp,
xfs_rtxnum_t r; /* result allocated rtext */ .tp = tp,
xfs_fileoff_t sb; /* summary file block number */ };
struct xfs_buf *sumbp; /* summary file block buffer */ int error;
xfs_rtxnum_t r; /* result allocated rtext */
xfs_fileoff_t sb; /* summary file block number */
struct xfs_buf *sumbp; /* summary file block buffer */
ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL)); ASSERT(xfs_isilocked(args.mp->m_rbmip, XFS_ILOCK_EXCL));
ASSERT(minlen > 0 && minlen <= maxlen); ASSERT(minlen > 0 && minlen <= maxlen);
/* /*
@@ -1229,11 +1238,11 @@ xfs_rtallocate_extent(
retry: retry:
sumbp = NULL; sumbp = NULL;
if (start == 0) { if (start == 0) {
error = xfs_rtallocate_extent_size(mp, tp, minlen, maxlen, len, error = xfs_rtallocate_extent_size(&args, minlen,
&sumbp, &sb, prod, &r); maxlen, len, &sumbp, &sb, prod, &r);
} else { } else {
error = xfs_rtallocate_extent_near(mp, tp, start, minlen, maxlen, error = xfs_rtallocate_extent_near(&args, start, minlen,
len, &sumbp, &sb, prod, &r); maxlen, len, &sumbp, &sb, prod, &r);
} }
if (error) if (error)