From: Catherine Hoang <catherine.hoang@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 6.6 CANDIDATE 18/24] xfs: short circuit xfs_growfs_data_private() if delta is zero
Date: Mon, 25 Mar 2024 15:07:18 -0700 [thread overview]
Message-ID: <20240325220724.42216-19-catherine.hoang@oracle.com> (raw)
In-Reply-To: <20240325220724.42216-1-catherine.hoang@oracle.com>
From: Eric Sandeen <sandeen@redhat.com>
commit 84712492e6dab803bf595fb8494d11098b74a652 upstream.
Although xfs_growfs_data() doesn't call xfs_growfs_data_private()
if in->newblocks == mp->m_sb.sb_dblocks, xfs_growfs_data_private()
further massages the new block count so that we don't i.e. try
to create a too-small new AG.
This may lead to a delta of "0" in xfs_growfs_data_private(), so
we end up in the shrink case and emit the EXPERIMENTAL warning
even if we're not changing anything at all.
Fix this by returning straightaway if the block delta is zero.
(nb: in older kernels, the result of entering the shrink case
with delta == 0 may actually let an -ENOSPC escape to userspace,
which is confusing for users.)
Fixes: fb2fc1720185 ("xfs: support shrinking unused space in the last AG")
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
---
fs/xfs/xfs_fsops.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 7cb75cb6b8e9..80811d16dde0 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -134,6 +134,10 @@ xfs_growfs_data_private(
if (delta < 0 && nagcount < 2)
return -EINVAL;
+ /* No work to do */
+ if (delta == 0)
+ return 0;
+
oagcount = mp->m_sb.sb_agcount;
/* allocate the new per-ag structures */
if (nagcount > oagcount) {
--
2.39.3
next prev parent reply other threads:[~2024-03-25 22:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 22:07 [PATCH 6.6 CANDIDATE 00/24] xfs backports for 6.6.y (from 6.8) Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 01/24] xfs: move the xfs_rtbitmap.c declarations to xfs_rtbitmap.h Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 02/24] xfs: convert rt bitmap extent lengths to xfs_rtbxlen_t Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 03/24] xfs: consider minlen sized extents in xfs_rtallocate_extent_block Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 04/24] xfs: don't leak recovered attri intent items Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 05/24] xfs: use xfs_defer_pending objects to recover " Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 06/24] xfs: pass the xfs_defer_pending object to iop_recover Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 07/24] xfs: transfer recovered intent item ownership in ->iop_recover Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 08/24] xfs: make rextslog computation consistent with mkfs Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 09/24] xfs: fix 32-bit truncation in xfs_compute_rextslog Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 10/24] xfs: don't allow overly small or large realtime volumes Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 11/24] xfs: make xchk_iget safer in the presence of corrupt inode btrees Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 12/24] xfs: remove unused fields from struct xbtree_ifakeroot Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 13/24] xfs: recompute growfsrtfree transaction reservation while growing rt volume Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 14/24] xfs: fix an off-by-one error in xreap_agextent_binval Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 15/24] xfs: force all buffers to be written during btree bulk load Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 16/24] xfs: add missing nrext64 inode flag check to scrub Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 17/24] xfs: initialise di_crc in xfs_log_dinode Catherine Hoang
2024-03-25 22:07 ` Catherine Hoang [this message]
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 19/24] xfs: add lock protection when remove perag from radix tree Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 20/24] xfs: fix perag leak when growfs fails Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 21/24] xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 22/24] xfs: update dir3 leaf block metadata after swap Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 23/24] xfs: reset XFS_ATTR_INCOMPLETE filter on node removal Catherine Hoang
2024-03-25 22:07 ` [PATCH 6.6 CANDIDATE 24/24] xfs: remove conditional building of rt geometry validator functions Catherine Hoang
2024-03-26 4:05 ` [PATCH 6.6 CANDIDATE 00/24] xfs backports for 6.6.y (from 6.8) Darrick J. Wong
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=20240325220724.42216-19-catherine.hoang@oracle.com \
--to=catherine.hoang@oracle.com \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).