diff options
Diffstat (limited to 'fs/xfs/xfs_alloc.c')
-rw-r--r-- | fs/xfs/xfs_alloc.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index 5a1393f5e020..9eab2dfdcbb5 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c | |||
@@ -17,25 +17,25 @@ | |||
17 | */ | 17 | */ |
18 | #include "xfs.h" | 18 | #include "xfs.h" |
19 | #include "xfs_fs.h" | 19 | #include "xfs_fs.h" |
20 | #include "xfs_types.h" | 20 | #include "xfs_format.h" |
21 | #include "xfs_log_format.h" | ||
22 | #include "xfs_shared.h" | ||
23 | #include "xfs_trans_resv.h" | ||
21 | #include "xfs_bit.h" | 24 | #include "xfs_bit.h" |
22 | #include "xfs_log.h" | ||
23 | #include "xfs_trans.h" | ||
24 | #include "xfs_sb.h" | 25 | #include "xfs_sb.h" |
25 | #include "xfs_ag.h" | 26 | #include "xfs_ag.h" |
26 | #include "xfs_mount.h" | 27 | #include "xfs_mount.h" |
27 | #include "xfs_bmap_btree.h" | ||
28 | #include "xfs_alloc_btree.h" | ||
29 | #include "xfs_ialloc_btree.h" | ||
30 | #include "xfs_dinode.h" | ||
31 | #include "xfs_inode.h" | 28 | #include "xfs_inode.h" |
32 | #include "xfs_btree.h" | 29 | #include "xfs_btree.h" |
30 | #include "xfs_alloc_btree.h" | ||
33 | #include "xfs_alloc.h" | 31 | #include "xfs_alloc.h" |
34 | #include "xfs_extent_busy.h" | 32 | #include "xfs_extent_busy.h" |
35 | #include "xfs_error.h" | 33 | #include "xfs_error.h" |
36 | #include "xfs_cksum.h" | 34 | #include "xfs_cksum.h" |
37 | #include "xfs_trace.h" | 35 | #include "xfs_trace.h" |
36 | #include "xfs_trans.h" | ||
38 | #include "xfs_buf_item.h" | 37 | #include "xfs_buf_item.h" |
38 | #include "xfs_log.h" | ||
39 | 39 | ||
40 | struct workqueue_struct *xfs_alloc_wq; | 40 | struct workqueue_struct *xfs_alloc_wq; |
41 | 41 | ||
@@ -2294,6 +2294,8 @@ xfs_read_agf( | |||
2294 | { | 2294 | { |
2295 | int error; | 2295 | int error; |
2296 | 2296 | ||
2297 | trace_xfs_read_agf(mp, agno); | ||
2298 | |||
2297 | ASSERT(agno != NULLAGNUMBER); | 2299 | ASSERT(agno != NULLAGNUMBER); |
2298 | error = xfs_trans_read_buf( | 2300 | error = xfs_trans_read_buf( |
2299 | mp, tp, mp->m_ddev_targp, | 2301 | mp, tp, mp->m_ddev_targp, |
@@ -2324,8 +2326,9 @@ xfs_alloc_read_agf( | |||
2324 | struct xfs_perag *pag; /* per allocation group data */ | 2326 | struct xfs_perag *pag; /* per allocation group data */ |
2325 | int error; | 2327 | int error; |
2326 | 2328 | ||
2327 | ASSERT(agno != NULLAGNUMBER); | 2329 | trace_xfs_alloc_read_agf(mp, agno); |
2328 | 2330 | ||
2331 | ASSERT(agno != NULLAGNUMBER); | ||
2329 | error = xfs_read_agf(mp, tp, agno, | 2332 | error = xfs_read_agf(mp, tp, agno, |
2330 | (flags & XFS_ALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0, | 2333 | (flags & XFS_ALLOC_FLAG_TRYLOCK) ? XBF_TRYLOCK : 0, |
2331 | bpp); | 2334 | bpp); |