.. | .. |
---|
9 | 9 | #include "xfs_format.h" |
---|
10 | 10 | #include "xfs_trans_resv.h" |
---|
11 | 11 | #include "xfs_mount.h" |
---|
12 | | -#include "xfs_defer.h" |
---|
13 | 12 | #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" |
---|
18 | 13 | #include "xfs_alloc.h" |
---|
19 | 14 | #include "xfs_rmap.h" |
---|
20 | | -#include "scrub/xfs_scrub.h" |
---|
21 | 15 | #include "scrub/scrub.h" |
---|
22 | 16 | #include "scrub/common.h" |
---|
23 | 17 | #include "scrub/btree.h" |
---|
24 | | -#include "scrub/trace.h" |
---|
25 | 18 | |
---|
26 | 19 | /* |
---|
27 | 20 | * Set us up to scrub free space btrees. |
---|
.. | .. |
---|
101 | 94 | union xfs_btree_rec *rec) |
---|
102 | 95 | { |
---|
103 | 96 | 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; |
---|
105 | 98 | xfs_agblock_t bno; |
---|
106 | 99 | xfs_extlen_t len; |
---|
107 | | - int error = 0; |
---|
108 | 100 | |
---|
109 | 101 | bno = be32_to_cpu(rec->alloc.ar_startblock); |
---|
110 | 102 | len = be32_to_cpu(rec->alloc.ar_blockcount); |
---|
.. | .. |
---|
116 | 108 | |
---|
117 | 109 | xchk_allocbt_xref(bs->sc, bno, len); |
---|
118 | 110 | |
---|
119 | | - return error; |
---|
| 111 | + return 0; |
---|
120 | 112 | } |
---|
121 | 113 | |
---|
122 | 114 | /* Scrub the freespace btrees for some AG. */ |
---|
.. | .. |
---|
125 | 117 | struct xfs_scrub *sc, |
---|
126 | 118 | xfs_btnum_t which) |
---|
127 | 119 | { |
---|
128 | | - struct xfs_owner_info oinfo; |
---|
129 | 120 | struct xfs_btree_cur *cur; |
---|
130 | 121 | |
---|
131 | | - xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_AG); |
---|
132 | 122 | 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); |
---|
134 | 124 | } |
---|
135 | 125 | |
---|
136 | 126 | int |
---|