|
|
| version 1.365, 2007/03/02 02:59:33 | version 1.366, 2007/03/03 02:57:44 |
|---|---|
| Line 130 STATIC int /* error */ | Line 130 STATIC int /* error */ |
| xfs_bmap_add_extent_hole_delay( | xfs_bmap_add_extent_hole_delay( |
| xfs_inode_t *ip, /* incore inode pointer */ | xfs_inode_t *ip, /* incore inode pointer */ |
| xfs_extnum_t idx, /* extent number to update/insert */ | xfs_extnum_t idx, /* extent number to update/insert */ |
| xfs_btree_cur_t *cur, /* if null, not a btree */ | |
| xfs_bmbt_irec_t *new, /* new data to add to file extents */ | xfs_bmbt_irec_t *new, /* new data to add to file extents */ |
| int *logflagsp,/* inode logging flags */ | int *logflagsp,/* inode logging flags */ |
| xfs_extdelta_t *delta, /* Change made to incore extents */ | xfs_extdelta_t *delta, /* Change made to incore extents */ |
| Line 399 xfs_bmap_count_leaves( | Line 398 xfs_bmap_count_leaves( |
| STATIC int | STATIC int |
| xfs_bmap_disk_count_leaves( | xfs_bmap_disk_count_leaves( |
| xfs_ifork_t *ifp, | |
| xfs_extnum_t idx, | xfs_extnum_t idx, |
| xfs_bmbt_block_t *block, | xfs_bmbt_block_t *block, |
| int numrecs, | int numrecs, |
| Line 580 xfs_bmap_add_extent( | Line 578 xfs_bmap_add_extent( |
| if (cur) | if (cur) |
| ASSERT((cur->bc_private.b.flags & | ASSERT((cur->bc_private.b.flags & |
| XFS_BTCUR_BPRV_WASDEL) == 0); | XFS_BTCUR_BPRV_WASDEL) == 0); |
| if ((error = xfs_bmap_add_extent_hole_delay(ip, idx, cur, new, | if ((error = xfs_bmap_add_extent_hole_delay(ip, idx, new, |
| &logflags, delta, rsvd))) | &logflags, delta, rsvd))) |
| goto done; | goto done; |
| } | } |
| Line 1841 STATIC int /* error */ | Line 1839 STATIC int /* error */ |
| xfs_bmap_add_extent_hole_delay( | xfs_bmap_add_extent_hole_delay( |
| xfs_inode_t *ip, /* incore inode pointer */ | xfs_inode_t *ip, /* incore inode pointer */ |
| xfs_extnum_t idx, /* extent number to update/insert */ | xfs_extnum_t idx, /* extent number to update/insert */ |
| xfs_btree_cur_t *cur, /* if null, not a btree */ | |
| xfs_bmbt_irec_t *new, /* new data to add to file extents */ | xfs_bmbt_irec_t *new, /* new data to add to file extents */ |
| int *logflagsp, /* inode logging flags */ | int *logflagsp, /* inode logging flags */ |
| xfs_extdelta_t *delta, /* Change made to incore extents */ | xfs_extdelta_t *delta, /* Change made to incore extents */ |
| Line 6425 xfs_bmap_count_tree( | Line 6422 xfs_bmap_count_tree( |
| for (;;) { | for (;;) { |
| nextbno = be64_to_cpu(block->bb_rightsib); | nextbno = be64_to_cpu(block->bb_rightsib); |
| numrecs = be16_to_cpu(block->bb_numrecs); | numrecs = be16_to_cpu(block->bb_numrecs); |
| if (unlikely(xfs_bmap_disk_count_leaves(ifp, | if (unlikely(xfs_bmap_disk_count_leaves(0, |
| 0, block, numrecs, count) < 0)) { | block, numrecs, count) < 0)) { |
| xfs_trans_brelse(tp, bp); | xfs_trans_brelse(tp, bp); |
| XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", | XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", |
| XFS_ERRLEVEL_LOW, mp); | XFS_ERRLEVEL_LOW, mp); |
| Line 6472 xfs_bmap_count_leaves( | Line 6469 xfs_bmap_count_leaves( |
| */ | */ |
| int | int |
| xfs_bmap_disk_count_leaves( | xfs_bmap_disk_count_leaves( |
| xfs_ifork_t *ifp, | |
| xfs_extnum_t idx, | xfs_extnum_t idx, |
| xfs_bmbt_block_t *block, | xfs_bmbt_block_t *block, |
| int numrecs, | int numrecs, |