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>

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index ecec604e6e4d7eddf9259d06b23d63426a3488a1..976659190d2753b6c8dd9250ebe85697b1a02d95 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -639,8 +639,6 @@ xfs_bmbt_change_owner(
        ASSERT(XFS_IFORK_PTR(ip, whichfork)->if_format == XFS_DINODE_FMT_BTREE);
 
        cur = xfs_bmbt_init_cursor(ip->i_mount, tp, ip, whichfork);
-       if (!cur)
-               return -ENOMEM;
        cur->bc_ino.flags |= XFS_BTCUR_BMBT_INVALID_OWNER;
 
        error = xfs_btree_change_owner(cur, new_owner, buffer_list);

diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
index cc919a2ee870f09c00e579eeae95bccb98338321..4c5831646bd9bb45d9ef82ab8631f702a0ba8c15 100644 (file)
--- a/fs/xfs/libxfs/xfs_ialloc_btree.c
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
@@ -672,11 +672,6 @@ xfs_inobt_cur(
                return error;
 
        cur = xfs_inobt_init_cursor(mp, tp, *agi_bpp, agno, which);
-       if (!cur) {
-               xfs_trans_brelse(tp, *agi_bpp);
-               *agi_bpp = NULL;
-               return -ENOMEM;
-       }
        *curpp = cur;
        return 0;
 }

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 2076627243b02d177cc9165c198b7d54816b9c33..2037b9f230698972255a4ed86137422287ad3824 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1179,10 +1179,6 @@ xfs_refcount_finish_one(
                        return error;
 
                rcur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno);
-               if (!rcur) {
-                       error = -ENOMEM;
-                       goto out_cur;
-               }
                rcur->bc_ag.refc.nr_ops = nr_ops;
                rcur->bc_ag.refc.shape_changes = shape_changes;
        }
@@ -1217,11 +1213,6 @@ xfs_refcount_finish_one(
                trace_xfs_refcount_finish_one_leftover(mp, agno, type,
                                bno, blockcount, new_agbno, *new_len);
        return error;
-
-out_cur:
-       xfs_trans_brelse(tp, agbp);
-
-       return error;
 }
 
 /*

diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c
index 2668ebe02865f1539cb3187eede38a3086d9e382..10e0cf9949a28738433083975c50ed1cc007f340 100644 (file)
--- a/fs/xfs/libxfs/xfs_rmap.c
+++ b/fs/xfs/libxfs/xfs_rmap.c
@@ -2404,10 +2404,6 @@ xfs_rmap_finish_one(
                        return -EFSCORRUPTED;
 
                rcur = xfs_rmapbt_init_cursor(mp, tp, agbp, agno);
-               if (!rcur) {
-                       error = -ENOMEM;
-                       goto out_cur;
-               }
        }
        *pcur = rcur;
 
@@ -2446,11 +2442,6 @@ xfs_rmap_finish_one(
                error = -EFSCORRUPTED;
        }
        return error;
-
-out_cur:
-       xfs_trans_brelse(tp, agbp);
-
-       return error;
 }
 
 /*

diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c
index 401f71579ce6d136b36fd176d7e9baca9f1a893f..23690f824ffa061e48b930f11eac2115ecd5dc6d 100644 (file)
--- a/fs/xfs/scrub/agheader_repair.c
+++ b/fs/xfs/scrub/agheader_repair.c
@@ -829,8 +829,6 @@ xrep_agi_calc_from_btrees(
 
                cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.agno,
                                XFS_BTNUM_FINO);
-               if (error)
-                       goto err;
                error = xfs_btree_count_blocks(cur, &blocks);
                if (error)
                        goto err;

diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index bce4421acdb999ff922ed70cb76bdf86b8fb5478..33559c3a4bc3d40489668b9f2bb801e820835c14 100644 (file)
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -558,10 +558,6 @@ xchk_bmap_check_ag_rmaps(
                return error;
 
        cur = xfs_rmapbt_init_cursor(sc->mp, sc->tp, agf, agno);
-       if (!cur) {
-               error = -ENOMEM;
-               goto out_agf;
-       }
 
        sbcri.sc = sc;
        sbcri.whichfork = whichfork;
@@ -570,7 +566,6 @@ xchk_bmap_check_ag_rmaps(
                error = 0;
 
        xfs_btree_del_cursor(cur, error);
-out_agf:
        xfs_trans_brelse(sc->tp, agf);
        return error;
 }

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index 18876056e5e02af78d29f6c7a5ac24fc74c3b32c..8ea6d4aa3f55b8ab32f36ef56595c5cbb67081fd 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -466,8 +466,6 @@ xchk_ag_btcur_init(
                /* Set up a bnobt cursor for cross-referencing. */
                sa->bno_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
                                agno, XFS_BTNUM_BNO);
-               if (!sa->bno_cur)
-                       goto err;
        }
 
        if (sa->agf_bp &&
@@ -475,8 +473,6 @@ xchk_ag_btcur_init(
                /* Set up a cntbt cursor for cross-referencing. */
                sa->cnt_cur = xfs_allocbt_init_cursor(mp, sc->tp, sa->agf_bp,
                                agno, XFS_BTNUM_CNT);
-               if (!sa->cnt_cur)
-                       goto err;
        }
 
        /* Set up a inobt cursor for cross-referencing. */
@@ -484,8 +480,6 @@ xchk_ag_btcur_init(
            xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_INO)) {
                sa->ino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
                                        agno, XFS_BTNUM_INO);
-               if (!sa->ino_cur)
-                       goto err;
        }
 
        /* Set up a finobt cursor for cross-referencing. */
@@ -493,8 +487,6 @@ xchk_ag_btcur_init(
            xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_FINO)) {
                sa->fino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp,
                                agno, XFS_BTNUM_FINO);
-               if (!sa->fino_cur)
-                       goto err;
        }
 
        /* Set up a rmapbt cursor for cross-referencing. */
@@ -502,8 +494,6 @@ xchk_ag_btcur_init(
            xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_RMAP)) {
                sa->rmap_cur = xfs_rmapbt_init_cursor(mp, sc->tp, sa->agf_bp,
                                agno);
-               if (!sa->rmap_cur)
-                       goto err;
        }
 
        /* Set up a refcountbt cursor for cross-referencing. */
@@ -511,13 +501,9 @@ xchk_ag_btcur_init(
            xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_REFC)) {
                sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,
                                sa->agf_bp, agno);
-               if (!sa->refc_cur)
-                       goto err;
        }
 
        return 0;
-err:
-       return -ENOMEM;
 }
 
 /* Release the AG header context and btree cursors. */