change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/fs/xfs/scrub/trace.c
..
..
@@ -10,15 +10,9 @@
10
10
 #include "xfs_log_format.h"
11
11
 #include "xfs_trans_resv.h"
12
12
 #include "xfs_mount.h"
13
-#include "xfs_defer.h"
14
-#include "xfs_da_format.h"
15
13
 #include "xfs_inode.h"
16
14
 #include "xfs_btree.h"
17
-#include "xfs_trans.h"
18
-#include "xfs_bit.h"
19
-#include "scrub/xfs_scrub.h"
20
15
 #include "scrub/scrub.h"
21
-#include "scrub/common.h"
22
16
 
23
17
 /* Figure out which block the btree cursor was pointing to. */
24
18
 static inline xfs_fsblock_t
..
..
@@ -30,9 +24,9 @@
30
24
 		return XFS_DADDR_TO_FSB(cur->bc_mp, cur->bc_bufs[level]->b_bn);
31
25
 	else if (level == cur->bc_nlevels - 1 &&
32
26
 		 cur->bc_flags & XFS_BTREE_LONG_PTRS)
33
-		return XFS_INO_TO_FSB(cur->bc_mp, cur->bc_private.b.ip->i_ino);
27
+		return XFS_INO_TO_FSB(cur->bc_mp, cur->bc_ino.ip->i_ino);
34
28
 	else if (!(cur->bc_flags & XFS_BTREE_LONG_PTRS))
35
-		return XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_private.a.agno, 0);
29
+		return XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_ag.agno, 0);
36
30
 	return NULLFSBLOCK;
37
31
 }
38
32