提交 e9ed9d22 编写于 作者: E Eric Sandeen 提交者: Tim Shimmin

[XFS] remove more misc. unused args

Patch provided by Eric Sandeen.

SGI-PV: 961695
SGI-Modid: xfs-linux-melb:xfs-kern:28205a
Signed-off-by: NEric Sandeen <sandeen@sandeen.net>
Signed-off-by: NLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: NTim Shimmin <tes@sgi.com>
上级 ef497f8a
...@@ -130,7 +130,6 @@ STATIC int /* error */ ...@@ -130,7 +130,6 @@ 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 */
...@@ -399,7 +398,6 @@ xfs_bmap_count_leaves( ...@@ -399,7 +398,6 @@ 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,
...@@ -580,7 +578,7 @@ xfs_bmap_add_extent( ...@@ -580,7 +578,7 @@ 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;
} }
...@@ -1841,7 +1839,6 @@ STATIC int /* error */ ...@@ -1841,7 +1839,6 @@ 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 */
...@@ -6425,8 +6422,8 @@ xfs_bmap_count_tree( ...@@ -6425,8 +6422,8 @@ 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);
...@@ -6472,7 +6469,6 @@ xfs_bmap_count_leaves( ...@@ -6472,7 +6469,6 @@ 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,
......
...@@ -1509,7 +1509,6 @@ xlog_recover_insert_item_frontq( ...@@ -1509,7 +1509,6 @@ xlog_recover_insert_item_frontq(
STATIC int STATIC int
xlog_recover_reorder_trans( xlog_recover_reorder_trans(
xlog_t *log,
xlog_recover_t *trans) xlog_recover_t *trans)
{ {
xlog_recover_item_t *first_item, *itemq, *itemq_next; xlog_recover_item_t *first_item, *itemq, *itemq_next;
...@@ -1867,7 +1866,6 @@ xlog_recover_do_inode_buffer( ...@@ -1867,7 +1866,6 @@ xlog_recover_do_inode_buffer(
/*ARGSUSED*/ /*ARGSUSED*/
STATIC void STATIC void
xlog_recover_do_reg_buffer( xlog_recover_do_reg_buffer(
xfs_mount_t *mp,
xlog_recover_item_t *item, xlog_recover_item_t *item,
xfs_buf_t *bp, xfs_buf_t *bp,
xfs_buf_log_format_t *buf_f) xfs_buf_log_format_t *buf_f)
...@@ -2083,7 +2081,7 @@ xlog_recover_do_dquot_buffer( ...@@ -2083,7 +2081,7 @@ xlog_recover_do_dquot_buffer(
if (log->l_quotaoffs_flag & type) if (log->l_quotaoffs_flag & type)
return; return;
xlog_recover_do_reg_buffer(mp, item, bp, buf_f); xlog_recover_do_reg_buffer(item, bp, buf_f);
} }
/* /*
...@@ -2184,7 +2182,7 @@ xlog_recover_do_buffer_trans( ...@@ -2184,7 +2182,7 @@ xlog_recover_do_buffer_trans(
(XFS_BLI_UDQUOT_BUF|XFS_BLI_PDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) { (XFS_BLI_UDQUOT_BUF|XFS_BLI_PDQUOT_BUF|XFS_BLI_GDQUOT_BUF)) {
xlog_recover_do_dquot_buffer(mp, log, item, bp, buf_f); xlog_recover_do_dquot_buffer(mp, log, item, bp, buf_f);
} else { } else {
xlog_recover_do_reg_buffer(mp, item, bp, buf_f); xlog_recover_do_reg_buffer(item, bp, buf_f);
} }
if (error) if (error)
return XFS_ERROR(error); return XFS_ERROR(error);
...@@ -2765,7 +2763,7 @@ xlog_recover_do_trans( ...@@ -2765,7 +2763,7 @@ xlog_recover_do_trans(
int error = 0; int error = 0;
xlog_recover_item_t *item, *first_item; xlog_recover_item_t *item, *first_item;
if ((error = xlog_recover_reorder_trans(log, trans))) if ((error = xlog_recover_reorder_trans(trans)))
return error; return error;
first_item = item = trans->r_itemq; first_item = item = trans->r_itemq;
do { do {
......
...@@ -2120,7 +2120,6 @@ int xfs_rm_attempts; ...@@ -2120,7 +2120,6 @@ int xfs_rm_attempts;
STATIC int STATIC int
xfs_lock_dir_and_entry( xfs_lock_dir_and_entry(
xfs_inode_t *dp, xfs_inode_t *dp,
bhv_vname_t *dentry,
xfs_inode_t *ip) /* inode of entry 'name' */ xfs_inode_t *ip) /* inode of entry 'name' */
{ {
int attempts; int attempts;
...@@ -2439,7 +2438,7 @@ xfs_remove( ...@@ -2439,7 +2438,7 @@ xfs_remove(
return error; return error;
} }
error = xfs_lock_dir_and_entry(dp, dentry, ip); error = xfs_lock_dir_and_entry(dp, ip);
if (error) { if (error) {
REMOVE_DEBUG_TRACE(__LINE__); REMOVE_DEBUG_TRACE(__LINE__);
xfs_trans_cancel(tp, cancel_flags); xfs_trans_cancel(tp, cancel_flags);
...@@ -3095,7 +3094,7 @@ xfs_rmdir( ...@@ -3095,7 +3094,7 @@ xfs_rmdir(
* that the directory entry for the child directory inode has * that the directory entry for the child directory inode has
* not changed while we were obtaining a log reservation. * not changed while we were obtaining a log reservation.
*/ */
error = xfs_lock_dir_and_entry(dp, dentry, cdp); error = xfs_lock_dir_and_entry(dp, cdp);
if (error) { if (error) {
xfs_trans_cancel(tp, cancel_flags); xfs_trans_cancel(tp, cancel_flags);
IRELE(cdp); IRELE(cdp);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册