xfs: Remove redundant btree insert code
cover xfs: Remove redundant btree insert code
This depends on the prior changes
([PATCH 0/2] xfs: add missing cursor status check after btree ops)
The btree insert code returns both an error and a status var, but they are redundant as described in the first patch here.
Every caller handles the error first, and never gets to the status check, so all that can be removed.
RFC to see if this direction and the patch splitup/granularity seems ok.
If so the opportunity exists on the btree delete side as well.
libxfs/xfs_alloc.c | 32 +++------------------ libxfs/xfs_bmap.c | 76 +++++++----------------------------------------- libxfs/xfs_btree.c | 4 -- libxfs/xfs_btree.h | 2 - libxfs/xfs_ialloc.c | 28 +++--------------- libxfs/xfs_ialloc.h | 3 - libxfs/xfs_refcount.c | 45 +++++------------------------ libxfs/xfs_refcount.h | 2 - libxfs/xfs_rmap.c | 46 ++++-------------------------- scrub/rcbag.c | 6 --- scrub/rcbag_btree.c | 5 +-- scrub/rcbag_btree.h | 3 - 12 files changed, 46 insertions(+), 206 deletions(-)
PATCH 1/5 xfs: remove redundant stat checks after xfs_btree_insert()
xfs_btree_insert() already validates its own status internally; it checks the result of xfs_btree_insrec(). If it succeeds, it returns error == 0 and status == 1. If that fails, it returns a nonzero error and never even updates stat.
This makes every instance of the 2nd test in this idiom:
if ((error = xfs_btree_insert(cnt_cur, &i)))
return error;
if (XFS_IS_CORRUPT(mp, i != 1)) {
xfs_btree_mark_sick(cnt_cur);
return -EFSCORRUPTED;
}duplicate/unreachable code at best, which is good because on an error return it would have tested a stale variable.
--- fs/xfs/libxfs/xfs_alloc.c | 22 --------------- fs/xfs/libxfs/xfs_bmap.c | 54 ------------------------------------ fs/xfs/libxfs/xfs_refcount.c | 9 ------ fs/xfs/libxfs/xfs_rmap.c | 32 --------------------- 4 files changed, 117 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +0 -22
@@ -694,10 +694,6 @@ xfs_alloc_fixup_trees( }if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cnt_cur); -return -EFSCORRUPTED ; - } }if (nfbno2 !=NULLAGBLOCK ) {if ((error =xfs_alloc_lookup_eq (cnt_cur, nfbno2, nflen2, &i)))
@@ -708,10 +704,6 @@ xfs_alloc_fixup_trees( }if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cnt_cur); -return -EFSCORRUPTED ; - } }/* * Fix up the by-block btree entry(s).
@@ -745,10 +737,6 @@ xfs_alloc_fixup_trees( }if ((error =xfs_btree_insert (bno_cur, &i)))return error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (bno_cur); -return -EFSCORRUPTED ; - } }if (fixup_longest)
@@ -2314,11 +2302,6 @@ xfs_free_ag_extent( nlen = len;if ((error =xfs_btree_insert (bno_cur, &i))) goto error0; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (bno_cur); - error = -EFSCORRUPTED ; - goto error0; - } }xfs_btree_del_cursor (bno_cur,XFS_BTREE_NOERROR ); bno_cur =NULL ;
@@ -2341,11 +2324,6 @@ xfs_free_ag_extent( fixup_longest = true;if ((error =xfs_btree_insert (cnt_cur, &i))) goto error0; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cnt_cur); - error = -EFSCORRUPTED ; - goto error0; - }if (fixup_longest) { error =xfs_alloc_fixup_longest (cnt_cur);if (error)
fs/xfs/libxfs/xfs_bmap.c +0 -54
120 lines not on this page · raw message
fs/xfs/libxfs/xfs_refcount.c +0 -9
@@ -276,15 +276,6 @@ xfs_refcount_insert( cur->bc_rec.rc.rc_domain = irec->rc_domain; error =xfs_btree_insert (cur, i); -if (error) - goto out_error; -if (XFS_IS_CORRUPT (cur->bc_mp, *i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto out_error; - } - -out_error:if (error)trace_xfs_refcount_insert_error (cur, error, _RET_IP_);return error;
fs/xfs/libxfs/xfs_rmap.c +0 -32
@@ -146,13 +146,6 @@ xfs_rmap_insert( rcur->bc_rec.r.rm_offset = offset; rcur->bc_rec.r.rm_flags = flags; error =xfs_btree_insert (rcur, &i); -if (error) - goto done; -if (XFS_IS_CORRUPT (rcur->bc_mp, i !=1 )) { -xfs_btree_mark_sick (rcur); - error = -EFSCORRUPTED ; - goto done; - } done:if (error)trace_xfs_rmap_insert_error (rcur, error, _RET_IP_);
@@ -1185,11 +1178,6 @@ xfs_rmap_map( error =xfs_btree_insert (cur, &i);if (error) goto out_error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto out_error; - } }trace_xfs_rmap_map_done (cur, bno, len, unwritten, oinfo);
@@ -1592,11 +1580,6 @@ xfs_rmap_convert( error =xfs_btree_insert (cur, &i);if (error) goto done; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto done; - }break ;case RMAP_RIGHT_FILLING |RMAP_RIGHT_CONTIG :
@@ -1650,11 +1633,6 @@ xfs_rmap_convert( error =xfs_btree_insert (cur, &i);if (error) goto done; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto done; - }break ;case 0 :
@@ -1683,11 +1661,6 @@ xfs_rmap_convert( error =xfs_btree_insert (cur, &i);if (error) goto done; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto done; - }/* * Reset the cursor to the position of the new extent * we are about to insert as we can't trust it after
@@ -1709,11 +1682,6 @@ xfs_rmap_convert( error =xfs_btree_insert (cur, &i);if (error) goto done; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto done; - }break ;case RMAP_LEFT_FILLING |RMAP_LEFT_CONTIG |RMAP_RIGHT_CONTIG :
Signature · 1 line
2.55.0
Re: [PATCH 1/5] xfs: remove redundant stat checks after xfs_btree_insert()
Quoted 14 lines · Eric Sandeen
xfs_btree_insert()already validates its own status internally; it checks the result ofxfs_btree_insrec(). If it succeeds, it returns error == 0 and status == 1. If that fails, it returns a nonzero error and never even updates stat.This makes every instance of the 2nd test in this idiom:
if ((error = xfs_btree_insert(cnt_cur, &i))) return error; if (XFS_IS_CORRUPT(mp, i != 1)) { xfs_btree_mark_sick(cnt_cur); return -EFSCORRUPTED; }
Quoted 2 lines
duplicate/unreachable code at best, which is good because on an error return it would have tested a stale variable.
rereading this, it's not very clear.
I'll tidy up the message somehow on a proper resend.
Quoted 1 line
Signed-off-by Eric Sandeen <[email protected]>
PATCH 2/5 xfs: remove redundant stat checks after xfs_refcount_insert()
In reply to Eric Sandeenxfs_refcount_insert() simply returns the error and status from xfs_btree_insert, which has already validated the insert or returned an error.
This makes every instance of the 2nd test in this idiom:
if ((error = xfs_refcount_insert(cnt_cur, &i)))
return error;
if (XFS_IS_CORRUPT(mp, i != 1)) {
xfs_btree_mark_sick(cnt_cur);
return -EFSCORRUPTED;
}duplicate/unreachable code. Remove them.
--- fs/xfs/libxfs/xfs_refcount.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
fs/xfs/libxfs/xfs_refcount.c +2 -17
@@ -457,12 +457,8 @@ xfs_refcount_split_extent( error =xfs_refcount_insert (cur, &tmp, &found_rec);if (error) goto out_error; -if (XFS_IS_CORRUPT (cur->bc_mp, found_rec !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto out_error; - } -return error; + +return 0 ; out_error:trace_xfs_refcount_split_extent_error (cur, error, _RET_IP_);
@@ -1191,12 +1187,6 @@ xfs_refcount_adjust_extents( &found_tmp);if (error) goto out_error; -if (XFS_IS_CORRUPT (cur->bc_mp, - found_tmp !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto out_error; - } }else { error =xrefc_free_extent (cur, &tmp);if (error)
@@ -1841,11 +1831,6 @@ xfs_refcount_adjust_cow_extents( &found_tmp);if (error) goto out_error; -if (XFS_IS_CORRUPT (cur->bc_mp, found_tmp !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto out_error; - }break ;case XFS_REFCOUNT_ADJUST_COW_FREE :/* Removing a CoW reservation, there should be one extent. */
Signature · 1 line
2.55.0
PATCH 3/5 xfs: remove redundant stat checks after xfs_inobt_insert_rec()
In reply to Eric Sandeenxfs_inobt_insert_rec() simply returns the error and status from xfs_btree_insert, which has already validated the insert or returned an error.
This makes every instance of the 2nd test in this idiom:
if ((error = xfs_inobt_insert_rec(cnt_cur, &i)))
return error;
if (XFS_IS_CORRUPT(mp, i != 1)) {
xfs_btree_mark_sick(cnt_cur);
return -EFSCORRUPTED;
}duplicate/unreachable code. Remove them.
--- fs/xfs/libxfs/xfs_ialloc.c | 15 --------------- 1 file changed, 15 deletions(-)
fs/xfs/libxfs/xfs_ialloc.c +0 -15
@@ -236,7 +236,6 @@ xfs_inobt_insert(xfs_btree_del_cursor (cur,XFS_BTREE_ERROR );return error; } -ASSERT (i ==1 ); }xfs_btree_del_cursor (cur,XFS_BTREE_NOERROR );
@@ -572,12 +571,6 @@ xfs_inobt_insert_sprec( nrec->ir_free, &i);if (error) goto error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto error; - } - goto out; }
@@ -647,7 +640,6 @@ xfs_finobt_insert_sprec(struct xfs_buf *agbp, struct xfs_inobt_rec_incore *nrec) /* in/out: new rec. */ { - struct xfs_mount *mp = pag_mount(pag); struct xfs_btree_cur *cur;int error;int i;
@@ -665,11 +657,6 @@ xfs_finobt_insert_sprec( nrec->ir_free, &i);if (error) goto error; -if (XFS_IS_CORRUPT (mp, i !=1 )) { -xfs_btree_mark_sick (cur); - error = -EFSCORRUPTED ; - goto error; - } }else { error =xfs_inobt_update (cur, nrec);if (error)
@@ -2254,8 +2241,6 @@ xfs_difree_finobt( ibtrec->ir_free, &i);if (error) goto error; -ASSERT (i ==1 ); - goto out; }
Signature · 1 line
2.55.0
PATCH 4/5 xfs: remove redundant stat check after rcbagbt_insert()
In reply to Eric Sandeenrcbagbt_insert() simply returns the error and status from xfs_btree_insert, which has already validated the insert or returned an error.
This makes this instance of this idiom:
error = rcbagbt_insert(cur, &bagrec, &has);
if (error)
goto out_cur;
if (!has) {
error = -EFSCORRUPTED;
goto out_cur;
}duplicate/unreachable code. Remove it.
--- fs/xfs/scrub/rcbag.c | 4 ---- 1 file changed, 4 deletions(-)
fs/xfs/scrub/rcbag.c +0 -4
@@ -105,10 +105,6 @@ rcbag_add( error =rcbagbt_insert (cur, &bagrec, &has);if (error) goto out_cur; -if (!has) { - error = -EFSCORRUPTED ; - goto out_cur; - } }xfs_btree_del_cursor (cur,0 );
Signature · 1 line
2.55.0
PATCH 5/5 xfs: remove status parameter from several btree insert functions
In reply to Eric Sandeenxfs_btree_insert and its callers now have no need for the status parameter; either they return error = 0 / status = 1, or nonzero error and status 0. Every caller now handles the error and never reaches the duplicate status variable check. Remove the status params.
--- fs/xfs/libxfs/xfs_alloc.c | 10 +++++----- fs/xfs/libxfs/xfs_bmap.c | 22 +++++++++++----------- fs/xfs/libxfs/xfs_btree.c | 4 +--- fs/xfs/libxfs/xfs_btree.h | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 13 ++++++------- fs/xfs/libxfs/xfs_ialloc.h | 3 +-- fs/xfs/libxfs/xfs_refcount.c | 17 +++++++---------- fs/xfs/libxfs/xfs_refcount.h | 2 +- fs/xfs/libxfs/xfs_rmap.c | 14 +++++++------- fs/xfs/scrub/rcbag.c | 2 +- fs/xfs/scrub/rcbag_btree.c | 5 ++--- fs/xfs/scrub/rcbag_btree.h | 3 +-- 12 files changed, 44 insertions(+), 53 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +5 -5
@@ -692,7 +692,7 @@ xfs_alloc_fixup_trees(xfs_btree_mark_sick (cnt_cur);return -EFSCORRUPTED ; } -if ((error =xfs_btree_insert (cnt_cur, &i))) +if ((error =xfs_btree_insert (cnt_cur)))return error; }if (nfbno2 !=NULLAGBLOCK ) {
@@ -702,7 +702,7 @@ xfs_alloc_fixup_trees(xfs_btree_mark_sick (cnt_cur);return -EFSCORRUPTED ; } -if ((error =xfs_btree_insert (cnt_cur, &i))) +if ((error =xfs_btree_insert (cnt_cur)))return error; }/*
@@ -735,7 +735,7 @@ xfs_alloc_fixup_trees(xfs_btree_mark_sick (bno_cur);return -EFSCORRUPTED ; } -if ((error =xfs_btree_insert (bno_cur, &i))) +if ((error =xfs_btree_insert (bno_cur)))return error; }
@@ -2300,7 +2300,7 @@ xfs_free_ag_extent(else { nbno = bno; nlen = len; -if ((error =xfs_btree_insert (bno_cur, &i))) +if ((error =xfs_btree_insert (bno_cur))) goto error0; }xfs_btree_del_cursor (bno_cur,XFS_BTREE_NOERROR );
@@ -2322,7 +2322,7 @@ xfs_free_ag_extent( }if (xfs_alloc_cursor_at_lastrec (cnt_cur)) fixup_longest = true; -if ((error =xfs_btree_insert (cnt_cur, &i))) +if ((error =xfs_btree_insert (cnt_cur))) goto error0;if (fixup_longest) { error =xfs_alloc_fixup_longest (cnt_cur);
fs/xfs/libxfs/xfs_bmap.c +11 -11
@@ -1671,7 +1671,7 @@ xfs_bmap_add_extent_delay_real( error = -EFSCORRUPTED ; goto done; } - error =xfs_btree_insert (bma->cur, &i); + error =xfs_btree_insert (bma->cur);if (error) goto done; }
@@ -1737,7 +1737,7 @@ xfs_bmap_add_extent_delay_real( error = -EFSCORRUPTED ; goto done; } - error =xfs_btree_insert (bma->cur, &i); + error =xfs_btree_insert (bma->cur);if (error) goto done; }
@@ -1823,7 +1823,7 @@ xfs_bmap_add_extent_delay_real( error = -EFSCORRUPTED ; goto done; } - error =xfs_btree_insert (bma->cur, &i); + error =xfs_btree_insert (bma->cur);if (error) goto done; }
@@ -1907,7 +1907,7 @@ xfs_bmap_add_extent_delay_real( error = -EFSCORRUPTED ; goto done; } - error =xfs_btree_insert (bma->cur, &i); + error =xfs_btree_insert (bma->cur);if (error) goto done; }
@@ -2328,7 +2328,7 @@ xfs_bmap_add_extent_unwritten_real(if (error) goto done; cur->bc_rec.b = *new; -if ((error =xfs_btree_insert (cur, &i))) +if ((error =xfs_btree_insert (cur))) goto done; }break ;
@@ -2409,7 +2409,7 @@ xfs_bmap_add_extent_unwritten_real( error = -EFSCORRUPTED ; goto done; } -if ((error =xfs_btree_insert (cur, &i))) +if ((error =xfs_btree_insert (cur))) goto done; }break ;
@@ -2454,7 +2454,7 @@ xfs_bmap_add_extent_unwritten_real( goto done;/* new left extent - oldext */ cur->bc_rec.b =PREV ; -if ((error =xfs_btree_insert (cur, &i))) +if ((error =xfs_btree_insert (cur))) goto done;/* * Reset the cursor to the position of the new extent
@@ -2470,7 +2470,7 @@ xfs_bmap_add_extent_unwritten_real( goto done; }/* new middle extent - newext */ -if ((error =xfs_btree_insert (cur, &i))) +if ((error =xfs_btree_insert (cur))) goto done; }break ;
@@ -2724,7 +2724,7 @@ xfs_bmap_add_extent_hole_real( error = -EFSCORRUPTED ; goto done; } - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto done; }
@@ -5013,7 +5013,7 @@ xfs_bmap_del_extent_real(if (error)return error; cur->bc_rec.b = new; - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error && error != -ENOSPC )return error;/*
@@ -5906,7 +5906,7 @@ xfs_bmap_split_extent( error = -EFSCORRUPTED ; goto del_cursor; } - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto del_cursor; }
fs/xfs/libxfs/xfs_btree.c +1 -3
@@ -3728,8 +3728,7 @@ xfs_btree_insrec(*/ int xfs_btree_insert ( -struct xfs_btree_cur *cur, -int *stat) +struct xfs_btree_cur *cur) {int error;/* error return value */ int i;/* result value, 0 for failure */
@@ -3798,7 +3797,6 @@ xfs_btree_insert( } }while (!xfs_btree_ptr_is_null (cur, &nptr)); - *stat = i;return 0 ; error0:return error;
fs/xfs/libxfs/xfs_btree.h +1 -1
@@ -405,7 +405,7 @@ int xfs_btree_decrement(struct xfs_btree_cur *, int, int *);int xfs_btree_lookup (struct xfs_btree_cur *,xfs_lookup_t ,int *);int xfs_btree_update (struct xfs_btree_cur *,union xfs_btree_rec *);int xfs_btree_new_iroot (struct xfs_btree_cur *,int *,int *); -int xfs_btree_insert (struct xfs_btree_cur *,int *); +int xfs_btree_insert (struct xfs_btree_cur *);int xfs_btree_delete (struct xfs_btree_cur *,int *);int xfs_btree_get_rec (struct xfs_btree_cur *,union xfs_btree_rec **,int *); int xfs_btree_change_owner(struct xfs_btree_cur *cur, uint64_t new_owner,
fs/xfs/libxfs/xfs_ialloc.c +6 -7
@@ -186,14 +186,13 @@ xfs_inobt_insert_rec(uint16_t holemask, uint8_t count, int32_t freecount, - xfs_inofree_t free, - int *stat) + xfs_inofree_t free) { cur->bc_rec.i.ir_holemask = holemask; cur->bc_rec.i.ir_count = count; cur->bc_rec.i.ir_freecount = freecount; cur->bc_rec.i.ir_free = free; -return xfs_btree_insert (cur, stat); +return xfs_btree_insert (cur); }/*
@@ -231,7 +230,7 @@ xfs_inobt_insert( error =xfs_inobt_insert_rec (cur,XFS_INOBT_HOLEMASK_FULL ,XFS_INODES_PER_CHUNK ,XFS_INODES_PER_CHUNK , -XFS_INOBT_ALL_FREE , &i); +XFS_INOBT_ALL_FREE );if (error) {xfs_btree_del_cursor (cur,XFS_BTREE_ERROR );return error;
@@ -568,7 +567,7 @@ xfs_inobt_insert_sprec(if (i ==0 ) { error =xfs_inobt_insert_rec (cur, nrec->ir_holemask, nrec->ir_count, nrec->ir_freecount, - nrec->ir_free, &i); + nrec->ir_free);if (error) goto error; goto out;
@@ -654,7 +653,7 @@ xfs_finobt_insert_sprec(if (i ==0 ) { error =xfs_inobt_insert_rec (cur, nrec->ir_holemask, nrec->ir_count, nrec->ir_freecount, - nrec->ir_free, &i); + nrec->ir_free);if (error) goto error; }else {
@@ -2238,7 +2237,7 @@ xfs_difree_finobt( error =xfs_inobt_insert_rec (cur, ibtrec->ir_holemask, ibtrec->ir_count, ibtrec->ir_freecount, - ibtrec->ir_free, &i); + ibtrec->ir_free);if (error) goto error; goto out;
fs/xfs/libxfs/xfs_ialloc.h +1 -2
@@ -105,8 +105,7 @@ int xfs_ialloc_has_inodes_at_extent(struct xfs_btree_cur *cur,int xfs_ialloc_count_inodes (struct xfs_btree_cur *cur,xfs_agino_t *count,xfs_agino_t *freecount);int xfs_inobt_insert_rec (struct xfs_btree_cur *cur,uint16_t holemask, -uint8_t count,int32_t freecount,xfs_inofree_t free, -int *stat); +uint8_t count,int32_t freecount,xfs_inofree_t free);int xfs_ialloc_cluster_alignment (struct xfs_mount *mp);void xfs_ialloc_setup_geometry (struct xfs_mount *mp);
fs/xfs/libxfs/xfs_refcount.c +7 -10
@@ -263,8 +263,7 @@ xfs_refcount_update(int xfs_refcount_insert (struct xfs_btree_cur *cur, -struct xfs_refcount_irec *irec, -int *i) +struct xfs_refcount_irec *irec) {int error;
@@ -275,7 +274,7 @@ xfs_refcount_insert( cur->bc_rec.rc.rc_refcount = irec->rc_refcount; cur->bc_rec.rc.rc_domain = irec->rc_domain; - error =xfs_btree_insert (cur, i); + error =xfs_btree_insert (cur);if (error)trace_xfs_refcount_insert_error (cur, error, _RET_IP_);return error;
@@ -454,7 +453,7 @@ xfs_refcount_split_extent(/* Insert the left extent. */ tmp = rcext; tmp.rc_blockcount = agbno - rcext.rc_startblock; - error =xfs_refcount_insert (cur, &tmp, &found_rec); + error =xfs_refcount_insert (cur, &tmp);if (error) goto out_error;
@@ -1141,7 +1140,7 @@ xfs_refcount_adjust_extents( {struct xfs_refcount_irec ext, tmp;int error; -int found_rec, found_tmp; +int found_rec;/* Merging did all the work already. */ if (*aglen ==0 )
@@ -1183,8 +1182,7 @@ xfs_refcount_adjust_extents(*/ cur->bc_refc.nr_ops++;if (tmp.rc_refcount) { - error =xfs_refcount_insert (cur, &tmp, - &found_tmp); + error =xfs_refcount_insert (cur, &tmp);if (error) goto out_error; }else {
@@ -1784,7 +1782,7 @@ xfs_refcount_adjust_cow_extents( {struct xfs_refcount_irec ext, tmp;int error; -int found_rec, found_tmp; +int found_rec;if (aglen ==0 )return 0 ;
@@ -1827,8 +1825,7 @@ xfs_refcount_adjust_cow_extents(trace_xfs_refcount_modify_extent (cur, &tmp); - error =xfs_refcount_insert (cur, &tmp, - &found_tmp); + error =xfs_refcount_insert (cur, &tmp);if (error) goto out_error;break ;
fs/xfs/libxfs/xfs_refcount.h +1 -1
@@ -126,7 +126,7 @@ xfs_failaddr_t xfs_refcount_check_irec(struct xfs_perag *pag,xfs_failaddr_t xfs_rtrefcount_check_irec (struct xfs_rtgroup *rtg,const struct xfs_refcount_irec *irec);extern int xfs_refcount_insert (struct xfs_btree_cur *cur, -struct xfs_refcount_irec *irec,int *stat); +struct xfs_refcount_irec *irec);extern struct kmem_cache *xfs_refcount_intent_cache;
fs/xfs/libxfs/xfs_rmap.c +7 -7
@@ -145,7 +145,7 @@ xfs_rmap_insert( rcur->bc_rec.r.rm_owner = owner; rcur->bc_rec.r.rm_offset = offset; rcur->bc_rec.r.rm_flags = flags; - error =xfs_btree_insert (rcur, &i); + error =xfs_btree_insert (rcur); done:if (error)trace_xfs_rmap_insert_error (rcur, error, _RET_IP_);
@@ -855,7 +855,7 @@ xfs_rmap_unmap( cur->bc_rec.r.rm_owner, cur->bc_rec.r.rm_offset, cur->bc_rec.r.rm_flags); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto out_error; }
@@ -1175,7 +1175,7 @@ xfs_rmap_map( cur->bc_rec.r.rm_offset = offset; cur->bc_rec.r.rm_flags = flags;trace_xfs_rmap_insert (cur, bno, len, owner, offset, flags); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto out_error; }
@@ -1577,7 +1577,7 @@ xfs_rmap_convert(NEW .rm_flags = newext; cur->bc_rec.r =NEW ;trace_xfs_rmap_insert (cur, bno, len, owner, offset, newext); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto done;break ;
@@ -1630,7 +1630,7 @@ xfs_rmap_convert(NEW .rm_flags = newext; cur->bc_rec.r =NEW ;trace_xfs_rmap_insert (cur, bno, len, owner, offset, newext); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto done;break ;
@@ -1658,7 +1658,7 @@ xfs_rmap_convert(trace_xfs_rmap_insert (cur,NEW .rm_startblock,NEW .rm_blockcount,NEW .rm_owner,NEW .rm_offset,NEW .rm_flags); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto done;/*
@@ -1679,7 +1679,7 @@ xfs_rmap_convert( cur->bc_rec.r.rm_flags &= ~XFS_RMAP_UNWRITTEN ; cur->bc_rec.r.rm_flags |= newext;trace_xfs_rmap_insert (cur, bno, len, owner, offset, newext); - error =xfs_btree_insert (cur, &i); + error =xfs_btree_insert (cur);if (error) goto done;break ;
fs/xfs/scrub/rcbag.c +1 -1
@@ -102,7 +102,7 @@ rcbag_add( bagrec.rbg_blockcount = rmap->rm_blockcount; bagrec.rbg_refcount =1 ; - error =rcbagbt_insert (cur, &bagrec, &has); + error =rcbagbt_insert (cur, &bagrec);if (error) goto out_cur; }
fs/xfs/scrub/rcbag_btree.c +2 -3
@@ -342,11 +342,10 @@ rcbagbt_update(int rcbagbt_insert (struct xfs_btree_cur *cur, -const struct rcbag_rec *rec, -int *success) +const struct rcbag_rec *rec) {struct rcbag_rec *btrec = (struct rcbag_rec *)&cur->bc_rec;memcpy (btrec, rec,sizeof (struct rcbag_rec )); -return xfs_btree_insert (cur, success); +return xfs_btree_insert (cur); }
fs/xfs/scrub/rcbag_btree.h +1 -2
@@ -70,8 +70,7 @@ int rcbagbt_lookup_eq(struct xfs_btree_cur *cur, const struct xfs_rmap_irec *rmap, int *success);int rcbagbt_get_rec (struct xfs_btree_cur *cur,struct rcbag_rec *rec,int *has);int rcbagbt_update (struct xfs_btree_cur *cur,const struct rcbag_rec *rec); -int rcbagbt_insert (struct xfs_btree_cur *cur,const struct rcbag_rec *rec, -int *success); +int rcbagbt_insert (struct xfs_btree_cur *cur,const struct rcbag_rec *rec);#else # define rcbagbt_init_cur_cache () 0
Signature · 1 line
2.55.0
Re: [PATCH 5/5] xfs: remove status parameter from several btree insert functions
Quoted 26 lines · Eric Sandeen
xfs_btree_insertand its callers now have no need for the status parameter; either they return error = 0 / status = 1, or nonzero error and status 0. Every caller now handles the error and never reaches the duplicate status variable check. Remove the status params.Signed-off-by Eric Sandeen <[email protected]>--- fs/xfs/libxfs/xfs_alloc.c | 10 +++++----- fs/xfs/libxfs/xfs_bmap.c | 22 +++++++++++----------- fs/xfs/libxfs/xfs_btree.c | 4 +--- fs/xfs/libxfs/xfs_btree.h | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 13 ++++++------- fs/xfs/libxfs/xfs_ialloc.h | 3 +-- fs/xfs/libxfs/xfs_refcount.c | 17 +++++++---------- fs/xfs/libxfs/xfs_refcount.h | 2 +- fs/xfs/libxfs/xfs_rmap.c | 14 +++++++------- fs/xfs/scrub/rcbag.c | 2 +- fs/xfs/scrub/rcbag_btree.c | 5 ++--- fs/xfs/scrub/rcbag_btree.h | 3 +-- 12 files changed, 44 insertions(+), 53 deletions(-)fs/xfs/libxfs/xfs_alloc.c +0
-0
fs/xfs/libxfs/xfs_alloc.c xfs_alloc_fixup_trees( · line 695
Quoted 5 lines
fs/xfs/libxfs/xfs_alloc.c +1
-1@@ -692,7 +692,7 @@ xfs_alloc_fixup_trees(xfs_btree_mark_sick (cnt_cur);return -EFSCORRUPTED ; } -if ((error =xfs_btree_insert (cnt_cur, &i))) +if ((error =xfs_btree_insert (cnt_cur)))
While you are touching all of these, can you convert them to the more common pattern of:
error = xfs_btree_insert(cur); if (error) return error;
Otherwise the whole series looks good to me.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH 5/5] xfs: remove status parameter from several btree insert functions
Quoted 36 lines · Dave Chinner
Quoted 26 lines · Eric Sandeen
xfs_btree_insertand its callers now have no need for the status parameter; either they return error = 0 / status = 1, or nonzero error and status 0. Every caller now handles the error and never reaches the duplicate status variable check. Remove the status params.Signed-off-by Eric Sandeen <[email protected]>--- fs/xfs/libxfs/xfs_alloc.c | 10 +++++----- fs/xfs/libxfs/xfs_bmap.c | 22 +++++++++++----------- fs/xfs/libxfs/xfs_btree.c | 4 +--- fs/xfs/libxfs/xfs_btree.h | 2 +- fs/xfs/libxfs/xfs_ialloc.c | 13 ++++++------- fs/xfs/libxfs/xfs_ialloc.h | 3 +-- fs/xfs/libxfs/xfs_refcount.c | 17 +++++++---------- fs/xfs/libxfs/xfs_refcount.h | 2 +- fs/xfs/libxfs/xfs_rmap.c | 14 +++++++------- fs/xfs/scrub/rcbag.c | 2 +- fs/xfs/scrub/rcbag_btree.c | 5 ++--- fs/xfs/scrub/rcbag_btree.h | 3 +-- 12 files changed, 44 insertions(+), 53 deletions(-)fs/xfs/libxfs/xfs_alloc.c +0
-0fs/xfs/libxfs/xfs_alloc.c xfs_alloc_fixup_trees( · line 695
Quoted 5 lines
fs/xfs/libxfs/xfs_alloc.c +1
-1@@ -692,7 +692,7 @@ xfs_alloc_fixup_trees(xfs_btree_mark_sick (cnt_cur);return -EFSCORRUPTED ; } -if ((error =xfs_btree_insert (cnt_cur, &i))) +if ((error =xfs_btree_insert (cnt_cur)))While you are touching all of these, can you convert them to the more common pattern of:
Quoted 5 lines
error = xfs_btree_insert(cur); if (error) return error;Otherwise the whole series looks good to me.
That /adds/ lines, what are you talking about! ;)
Sure, I can do that if folks prefer.
-Eric
Re: [PATCH 5/5] xfs: remove status parameter from several btree insert functions
Quoted 11 lines · Eric Sandeen
Quoted 8 lines
While you are touching all of these, can you convert them to the more common pattern of:
error = xfs_btree_insert(cur); if (error) return error;Otherwise the whole series looks good to me.
That /adds/ lines, what are you talking about! ;)
Sure, I can do that if folks prefer.
I'd much prefer it, thanks.