github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: simply the free space btree repair code

Browse Source 
Now that the xfarray always knows how many valid records there are
stored inside of it, get rid of the shadow variable.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Darrick J. Wong 2026-09-22 23:00:29 -07:00 committed by Carlos Maiolino
parent 76ac15cafb
commit ebd528d198
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/xfs/scrub/alloc_repair.c
View File

@ -108,9 +108,6 @@ struct xrep_abt {
struct xfs_scrub *sc;
/* Number of non-null records in @free_records. */
uint64_t nr_real_records;
/* get_records()'s position in the free space record array. */
xfarray_idx_t array_cur;
@ -403,7 +400,6 @@ xrep_abt_find_freespace(
if (error)
goto err_agfl;
ra->nr_real_records = xfarray_length(ra->free_records);
err_agfl:
xfs_trans_brelse(sc->tp, agfl_bp);
err:
@ -446,15 +442,17 @@ xrep_abt_reserve_space(
uint64_t required;
unsigned int desired;
unsigned int len;
const uint64_t nr_records =
xfarray_length(ra->free_records);
/* Compute how many blocks we'll need. */
error = xfs_btree_bload_compute_geometry(cnt_cur,
&ra->new_cntbt.bload, ra->nr_real_records);
&ra->new_cntbt.bload, nr_records);
if (error)
break;
error = xfs_btree_bload_compute_geometry(bno_cur,
&ra->new_bnobt.bload, ra->nr_real_records);
&ra->new_bnobt.bload, nr_records);
if (error)
break;
@ -470,7 +468,7 @@ xrep_abt_reserve_space(
desired = required - allocated;
/* We need space but there's none left; bye! */
if (ra->nr_real_records == 0) {
if (nr_records == 0) {
error = -ENOSPC;
break;
}
@ -520,7 +518,6 @@ xrep_abt_reserve_space(
error = xfarray_trim(ra->free_records, 1);
if (error)
break;
ra->nr_real_records--;
record_nr--;
} while (1);