iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: kill ialloced in xfs_dialloc()

Browse Source 
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>
This commit is contained in:
Gao Xiang 2020-12-09 10:05:17 -08:00 committed by Darrick J. Wong
parent 8d822dc38a
commit 3937493c50
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fs/xfs/libxfs/xfs_ialloc.c
View File

@ -607,13 +607,13 @@ error:
/* /*
* Allocate new inodes in the allocation group specified by agbp. * 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 STATIC int
xfs_ialloc_ag_alloc( xfs_ialloc_ag_alloc(
struct xfs_trans *tp, struct xfs_trans *tp,
struct xfs_buf *agbp, struct xfs_buf *agbp)
int *alloc)
{ {
struct xfs_agi *agi; struct xfs_agi *agi;
struct xfs_alloc_arg args; struct xfs_alloc_arg args;
@ -795,10 +795,9 @@ sparse_alloc:
allocmask = (1 << (newlen / XFS_INODES_PER_HOLEMASK_BIT)) - 1; allocmask = (1 << (newlen / XFS_INODES_PER_HOLEMASK_BIT)) - 1;
} }
if (args.fsbno == NULLFSBLOCK) { if (args.fsbno == NULLFSBLOCK)
*alloc = 0; return 1;
return 0;
}
ASSERT(args.len == args.minlen); ASSERT(args.len == args.minlen);
/* /*
@ -903,7 +902,6 @@ sparse_alloc:
*/ */
xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen); xfs_trans_mod_sb(tp, XFS_TRANS_SB_ICOUNT, (long)newlen);
xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen); xfs_trans_mod_sb(tp, XFS_TRANS_SB_IFREE, (long)newlen);
*alloc = 1;
return 0; return 0;
} }
@ -1739,7 +1737,6 @@ xfs_dialloc_select_ag(
struct xfs_buf *agbp; struct xfs_buf *agbp;
xfs_agnumber_t agno; xfs_agnumber_t agno;
int error; int error;
int ialloced;
bool noroom = false; bool noroom = false;
xfs_agnumber_t start_agno; xfs_agnumber_t start_agno;
struct xfs_perag *pag; struct xfs_perag *pag;
@ -1812,9 +1809,8 @@ xfs_dialloc_select_ag(
if (!okalloc) if (!okalloc)
goto nextag_relse_buffer; goto nextag_relse_buffer;
error = xfs_ialloc_ag_alloc(*tpp, agbp);
error = xfs_ialloc_ag_alloc(*tpp, agbp, &ialloced); if (error < 0) {
if (error) {
xfs_trans_brelse(*tpp, agbp); xfs_trans_brelse(*tpp, agbp);
if (error == -ENOSPC) if (error == -ENOSPC)
@ -1822,7 +1818,7 @@ xfs_dialloc_select_ag(
break; break;
} }
if (ialloced) { if (error == 0) {
/* /*
* We successfully allocated space for an inode cluster * We successfully allocated space for an inode cluster
* in this AG. Roll the transaction so that we can * in this AG. Roll the transaction so that we can