xfs: kill ialloced in xfs_dialloc()

Source kernel commit: 3937493c502566d90a74c3439ebdb663d9380cc3

It's enough to just use return code, and get rid of an argument.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 3b5956fb5412fcd2b1910868e2e3ff5f59ccb164..26a3d4b27c899d340f424173ed55832008af1d5b 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -602,13 +602,13 @@ error:
 
 /*
  * Allocate new inodes in the allocation group specified by agbp.
- * Return 0 for success, else error code.
+ * Returns 0 if inodes were allocated in this AG; 1 if there was no space
+ * in this AG; or the usual negative error code.
  */
 STATIC int
 xfs_ialloc_ag_alloc(
        struct xfs_trans        *tp,
-       struct xfs_buf          *agbp,
-       int                     *alloc)
+       struct xfs_buf          *agbp)
 {
        struct xfs_agi          *agi;
        struct xfs_alloc_arg    args;
@@ -790,10 +790,9 @@ sparse_alloc:
                allocmask = (1 << (newlen / XFS_INODES_PER_HOLEMASK_BIT)) - 1;
        }
 
-       if (args.fsbno == NULLFSBLOCK) {
-               *alloc = 0;
-               return 0;
-       }
+       if (args.fsbno == NULLFSBLOCK)
+               return 1;
+
        ASSERT(args.len == args.minlen);
 
        /*
@@ -898,7 +897,6 @@ sparse_alloc:
         */
        xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen);
        xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen);
-       *alloc = 1;
        return 0;
 }
 
@@ -1734,7 +1732,6 @@ xfs_dialloc_select_ag(
        struct xfs_buf          *agbp;
        xfs_agnumber_t          agno;
        int                     error;
-       int                     ialloced;
        bool                    noroom = false;
        xfs_agnumber_t          start_agno;
        struct xfs_perag        *pag;
@@ -1807,9 +1804,8 @@ xfs_dialloc_select_ag(
                if (!okalloc)
                        goto nextag_relse_buffer;
 
-
-               error = xfs_ialloc_ag_alloc(*tpp, agbp, &ialloced);
-               if (error) {
+               error = xfs_ialloc_ag_alloc(*tpp, agbp);
+               if (error < 0) {
                        xfs_trans_brelse(*tpp, agbp);
 
                        if (error == -ENOSPC)
@@ -1817,7 +1813,7 @@ xfs_dialloc_select_ag(
                        break;
                }
 
-               if (ialloced) {
+               if (error == 0) {
                        /*
                         * We successfully allocated space for an inode cluster
                         * in this AG.  Roll the transaction so that we can