diff options
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
-rw-r--r-- | fs/xfs/xfs_bmap.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 05d43d112843..50f2213589f8 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
@@ -130,7 +130,6 @@ STATIC int /* error */ | |||
130 | xfs_bmap_add_extent_hole_delay( | 130 | xfs_bmap_add_extent_hole_delay( |
131 | xfs_inode_t *ip, /* incore inode pointer */ | 131 | xfs_inode_t *ip, /* incore inode pointer */ |
132 | xfs_extnum_t idx, /* extent number to update/insert */ | 132 | xfs_extnum_t idx, /* extent number to update/insert */ |
133 | xfs_btree_cur_t *cur, /* if null, not a btree */ | ||
134 | xfs_bmbt_irec_t *new, /* new data to add to file extents */ | 133 | xfs_bmbt_irec_t *new, /* new data to add to file extents */ |
135 | int *logflagsp,/* inode logging flags */ | 134 | int *logflagsp,/* inode logging flags */ |
136 | xfs_extdelta_t *delta, /* Change made to incore extents */ | 135 | xfs_extdelta_t *delta, /* Change made to incore extents */ |
@@ -399,7 +398,6 @@ xfs_bmap_count_leaves( | |||
399 | 398 | ||
400 | STATIC int | 399 | STATIC int |
401 | xfs_bmap_disk_count_leaves( | 400 | xfs_bmap_disk_count_leaves( |
402 | xfs_ifork_t *ifp, | ||
403 | xfs_extnum_t idx, | 401 | xfs_extnum_t idx, |
404 | xfs_bmbt_block_t *block, | 402 | xfs_bmbt_block_t *block, |
405 | int numrecs, | 403 | int numrecs, |
@@ -580,7 +578,7 @@ xfs_bmap_add_extent( | |||
580 | if (cur) | 578 | if (cur) |
581 | ASSERT((cur->bc_private.b.flags & | 579 | ASSERT((cur->bc_private.b.flags & |
582 | XFS_BTCUR_BPRV_WASDEL) == 0); | 580 | XFS_BTCUR_BPRV_WASDEL) == 0); |
583 | if ((error = xfs_bmap_add_extent_hole_delay(ip, idx, cur, new, | 581 | if ((error = xfs_bmap_add_extent_hole_delay(ip, idx, new, |
584 | &logflags, delta, rsvd))) | 582 | &logflags, delta, rsvd))) |
585 | goto done; | 583 | goto done; |
586 | } | 584 | } |
@@ -1841,7 +1839,6 @@ STATIC int /* error */ | |||
1841 | xfs_bmap_add_extent_hole_delay( | 1839 | xfs_bmap_add_extent_hole_delay( |
1842 | xfs_inode_t *ip, /* incore inode pointer */ | 1840 | xfs_inode_t *ip, /* incore inode pointer */ |
1843 | xfs_extnum_t idx, /* extent number to update/insert */ | 1841 | xfs_extnum_t idx, /* extent number to update/insert */ |
1844 | xfs_btree_cur_t *cur, /* if null, not a btree */ | ||
1845 | xfs_bmbt_irec_t *new, /* new data to add to file extents */ | 1842 | xfs_bmbt_irec_t *new, /* new data to add to file extents */ |
1846 | int *logflagsp, /* inode logging flags */ | 1843 | int *logflagsp, /* inode logging flags */ |
1847 | xfs_extdelta_t *delta, /* Change made to incore extents */ | 1844 | xfs_extdelta_t *delta, /* Change made to incore extents */ |
@@ -6425,8 +6422,8 @@ xfs_bmap_count_tree( | |||
6425 | for (;;) { | 6422 | for (;;) { |
6426 | nextbno = be64_to_cpu(block->bb_rightsib); | 6423 | nextbno = be64_to_cpu(block->bb_rightsib); |
6427 | numrecs = be16_to_cpu(block->bb_numrecs); | 6424 | numrecs = be16_to_cpu(block->bb_numrecs); |
6428 | if (unlikely(xfs_bmap_disk_count_leaves(ifp, | 6425 | if (unlikely(xfs_bmap_disk_count_leaves(0, |
6429 | 0, block, numrecs, count) < 0)) { | 6426 | block, numrecs, count) < 0)) { |
6430 | xfs_trans_brelse(tp, bp); | 6427 | xfs_trans_brelse(tp, bp); |
6431 | XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", | 6428 | XFS_ERROR_REPORT("xfs_bmap_count_tree(2)", |
6432 | XFS_ERRLEVEL_LOW, mp); | 6429 | XFS_ERRLEVEL_LOW, mp); |
@@ -6472,7 +6469,6 @@ xfs_bmap_count_leaves( | |||
6472 | */ | 6469 | */ |
6473 | int | 6470 | int |
6474 | xfs_bmap_disk_count_leaves( | 6471 | xfs_bmap_disk_count_leaves( |
6475 | xfs_ifork_t *ifp, | ||
6476 | xfs_extnum_t idx, | 6472 | xfs_extnum_t idx, |
6477 | xfs_bmbt_block_t *block, | 6473 | xfs_bmbt_block_t *block, |
6478 | int numrecs, | 6474 | int numrecs, |