hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/fs/xfs/scrub/alloc.c
....@@ -9,19 +9,12 @@
99 #include "xfs_format.h"
1010 #include "xfs_trans_resv.h"
1111 #include "xfs_mount.h"
12
-#include "xfs_defer.h"
1312 #include "xfs_btree.h"
14
-#include "xfs_bit.h"
15
-#include "xfs_log_format.h"
16
-#include "xfs_trans.h"
17
-#include "xfs_sb.h"
1813 #include "xfs_alloc.h"
1914 #include "xfs_rmap.h"
20
-#include "scrub/xfs_scrub.h"
2115 #include "scrub/scrub.h"
2216 #include "scrub/common.h"
2317 #include "scrub/btree.h"
24
-#include "scrub/trace.h"
2518
2619 /*
2720 * Set us up to scrub free space btrees.
....@@ -101,10 +94,9 @@
10194 union xfs_btree_rec *rec)
10295 {
10396 struct xfs_mount *mp = bs->cur->bc_mp;
104
- xfs_agnumber_t agno = bs->cur->bc_private.a.agno;
97
+ xfs_agnumber_t agno = bs->cur->bc_ag.agno;
10598 xfs_agblock_t bno;
10699 xfs_extlen_t len;
107
- int error = 0;
108100
109101 bno = be32_to_cpu(rec->alloc.ar_startblock);
110102 len = be32_to_cpu(rec->alloc.ar_blockcount);
....@@ -116,7 +108,7 @@
116108
117109 xchk_allocbt_xref(bs->sc, bno, len);
118110
119
- return error;
111
+ return 0;
120112 }
121113
122114 /* Scrub the freespace btrees for some AG. */
....@@ -125,12 +117,10 @@
125117 struct xfs_scrub *sc,
126118 xfs_btnum_t which)
127119 {
128
- struct xfs_owner_info oinfo;
129120 struct xfs_btree_cur *cur;
130121
131
- xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_AG);
132122 cur = which == XFS_BTNUM_BNO ? sc->sa.bno_cur : sc->sa.cnt_cur;
133
- return xchk_btree(sc, cur, xchk_allocbt_rec, &oinfo, NULL);
123
+ return xchk_btree(sc, cur, xchk_allocbt_rec, &XFS_RMAP_OINFO_AG, NULL);
134124 }
135125
136126 int