From: Gao Xiang <hsiangkao@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>, Gao Xiang <hsiangkao@redhat.com>
Subject: [PATCH v2 6/6] xfs: kill ialloced in xfs_dialloc()
Date: Fri, 4 Dec 2020 00:10:28 +0800 [thread overview]
Message-ID: <20201203161028.1900929-7-hsiangkao@redhat.com> (raw)
In-Reply-To: <20201203161028.1900929-1-hsiangkao@redhat.com>
It's enough to just use return code, and get rid of an argument.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
---
fs/xfs/libxfs/xfs_ialloc.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index 597629353d4d..ec63afb59156 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -607,13 +607,13 @@ xfs_inobt_insert_sprec(
/*
* 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;
@@ -795,10 +795,9 @@ xfs_ialloc_ag_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);
/*
@@ -903,7 +902,6 @@ xfs_ialloc_ag_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;
}
@@ -1749,7 +1747,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;
@@ -1823,17 +1820,14 @@ 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)
error = 0;
break;
- }
-
- if (ialloced) {
+ } else if (error == 0) {
/*
* We successfully allocated some inodes, so roll the
* transaction and return the locked AGI buffer to the
--
2.18.4
next prev parent reply other threads:[~2020-12-03 16:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 16:10 [PATCH v2 0/6] xfs: some xfs_dialloc() cleanup Gao Xiang
2020-12-03 16:10 ` [PATCH v2 1/6] xfs: convert noroom, okalloc in xfs_dialloc() to bool Gao Xiang
2020-12-03 20:32 ` Dave Chinner
2020-12-03 16:10 ` [PATCH v2 2/6] xfs: introduce xfs_dialloc_roll() Gao Xiang
2020-12-03 19:20 ` Darrick J. Wong
2020-12-03 16:10 ` [PATCH v2 3/6] xfs: move on-disk inode allocation out of xfs_ialloc() Gao Xiang
2020-12-03 19:21 ` Darrick J. Wong
2020-12-03 20:31 ` Dave Chinner
2020-12-04 0:58 ` Gao Xiang
2020-12-03 16:10 ` [PATCH v2 4/6] xfs: move xfs_dialloc_roll() into xfs_dialloc() Gao Xiang
2020-12-03 19:25 ` Darrick J. Wong
2020-12-03 16:10 ` [PATCH v2 5/6] xfs: spilt xfs_dialloc() into 2 functions Gao Xiang
2020-12-03 19:29 ` Darrick J. Wong
2020-12-03 16:10 ` Gao Xiang [this message]
2020-12-03 19:08 ` [PATCH v2 6/6] xfs: kill ialloced in xfs_dialloc() Darrick J. Wong
2020-12-03 20:33 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201203161028.1900929-7-hsiangkao@redhat.com \
--to=hsiangkao@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).