Skip to content

Commit 2e984ba

Browse files
josephhzdjwong
authored andcommitted
xfs: remove unneeded return value check for *init_cursor()
Since *init_cursor() can always return a valid cursor, the NULL check in caller is unneeded. So clean them up. This also keeps the behavior consistent with other callers. Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
1 parent 7bc1fea commit 2e984ba

File tree

7 files changed

+0
-46
lines changed

7 files changed

+0
-46
lines changed

fs/xfs/libxfs/xfs_bmap_btree.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,8 +639,6 @@ xfs_bmbt_change_owner(
639639
ASSERT(XFS_IFORK_PTR(ip, whichfork)->if_format == XFS_DINODE_FMT_BTREE);
640640

641641
cur = xfs_bmbt_init_cursor(ip->i_mount, tp, ip, whichfork);
642-
if (!cur)
643-
return -ENOMEM;
644642
cur->bc_ino.flags |= XFS_BTCUR_BMBT_INVALID_OWNER;
645643

646644
error = xfs_btree_change_owner(cur, new_owner, buffer_list);

fs/xfs/libxfs/xfs_ialloc_btree.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -672,11 +672,6 @@ xfs_inobt_cur(
672672
return error;
673673

674674
cur = xfs_inobt_init_cursor(mp, tp, *agi_bpp, agno, which);
675-
if (!cur) {
676-
xfs_trans_brelse(tp, *agi_bpp);
677-
*agi_bpp = NULL;
678-
return -ENOMEM;
679-
}
680675
*curpp = cur;
681676
return 0;
682677
}

fs/xfs/libxfs/xfs_refcount.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,10 +1179,6 @@ xfs_refcount_finish_one(
11791179
return error;
11801180

11811181
rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno);
1182-
if (!rcur) {
1183-
error = -ENOMEM;
1184-
goto out_cur;
1185-
}
11861182
rcur->bc_ag.refc.nr_ops = nr_ops;
11871183
rcur->bc_ag.refc.shape_changes = shape_changes;
11881184
}
@@ -1217,11 +1213,6 @@ xfs_refcount_finish_one(
12171213
trace_xfs_refcount_finish_one_leftover(mp, agno, type,
12181214
bno, blockcount, new_agbno, *new_len);
12191215
return error;
1220-
1221-
out_cur:
1222-
xfs_trans_brelse(tp, agbp);
1223-
1224-
return error;
12251216
}
12261217

12271218
/*

fs/xfs/libxfs/xfs_rmap.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2404,10 +2404,6 @@ xfs_rmap_finish_one(
24042404
return -EFSCORRUPTED;
24052405

24062406
rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno);
2407-
if (!rcur) {
2408-
error = -ENOMEM;
2409-
goto out_cur;
2410-
}
24112407
}
24122408
*pcur = rcur;
24132409

@@ -2446,11 +2442,6 @@ xfs_rmap_finish_one(
24462442
error = -EFSCORRUPTED;
24472443
}
24482444
return error;
2449-
2450-
out_cur:
2451-
xfs_trans_brelse(tp, agbp);
2452-
2453-
return error;
24542445
}
24552446

24562447
/*

fs/xfs/scrub/agheader_repair.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,6 @@ xrep_agi_calc_from_btrees(
829829

830830
cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.agno,
831831
XFS_BTNUM_FINO);
832-
if (error)
833-
goto err;
834832
error = xfs_btree_count_blocks(cur, &blocks);
835833
if (error)
836834
goto err;

fs/xfs/scrub/bmap.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,6 @@ xchk_bmap_check_ag_rmaps(
558558
return error;
559559

560560
cur = xfs_rmapbt_init_cursor(sc->mp, sc->tp, agf, agno);
561-
if (!cur) {
562-
error = -ENOMEM;
563-
goto out_agf;
564-
}
565561

566562
sbcri.sc = sc;
567563
sbcri.whichfork = whichfork;
@@ -570,7 +566,6 @@ xchk_bmap_check_ag_rmaps(
570566
error = 0;
571567

572568
xfs_btree_del_cursor(cur, error);
573-
out_agf:
574569
xfs_trans_brelse(sc->tp, agf);
575570
return error;
576571
}

fs/xfs/scrub/common.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -466,58 +466,44 @@ xchk_ag_btcur_init(
466466
/* Set up a bnobt cursor for cross-referencing. */
467467
sa->bno_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
468468
agno, XFS_BTNUM_BNO);
469-
if (!sa->bno_cur)
470-
goto err;
471469
}
472470

473471
if (sa->agf_bp &&
474472
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_CNT)) {
475473
/* Set up a cntbt cursor for cross-referencing. */
476474
sa->cnt_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
477475
agno, XFS_BTNUM_CNT);
478-
if (!sa->cnt_cur)
479-
goto err;
480476
}
481477

482478
/* Set up a inobt cursor for cross-referencing. */
483479
if (sa->agi_bp &&
484480
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_INO)) {
485481
sa->ino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
486482
agno, XFS_BTNUM_INO);
487-
if (!sa->ino_cur)
488-
goto err;
489483
}
490484

491485
/* Set up a finobt cursor for cross-referencing. */
492486
if (sa->agi_bp && xfs_sb_version_hasfinobt(&mp->m_sb) &&
493487
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_FINO)) {
494488
sa->fino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
495489
agno, XFS_BTNUM_FINO);
496-
if (!sa->fino_cur)
497-
goto err;
498490
}
499491

500492
/* Set up a rmapbt cursor for cross-referencing. */
501493
if (sa->agf_bp && xfs_sb_version_hasrmapbt(&mp->m_sb) &&
502494
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_RMAP)) {
503495
sa->rmap_cur = xfs_rmapbt_init_cursor(mp, sc->tp, sa->agf_bp,
504496
agno);
505-
if (!sa->rmap_cur)
506-
goto err;
507497
}
508498

509499
/* Set up a refcountbt cursor for cross-referencing. */
510500
if (sa->agf_bp && xfs_sb_version_hasreflink(&mp->m_sb) &&
511501
xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_REFC)) {
512502
sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,
513503
sa->agf_bp, agno);
514-
if (!sa->refc_cur)
515-
goto err;
516504
}
517505

518506
return 0;
519-
err:
520-
return -ENOMEM;
521507
}
522508

523509
/* Release the AG header context and btree cursors. */

0 commit comments

Comments
 (0)