From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
darrick.wong@oracle.com, david@fromorbit.com
Subject: [PATCH V6 09/11] xfs: Check for extent overflow when swapping extents
Date: Mon, 12 Oct 2020 14:59:36 +0530 [thread overview]
Message-ID: <20201012092938.50946-10-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20201012092938.50946-1-chandanrlinux@gmail.com>
Removing an initial range of source/donor file's extent and adding a new
extent (from donor/source file) in its place will cause extent count to
increase by 1.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_inode_fork.h | 7 +++++++
fs/xfs/xfs_bmap_util.c | 16 ++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index ded3c1b56c94..837c01595439 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -102,6 +102,13 @@ struct xfs_ifork {
#define XFS_IEXT_REFLINK_REMAP_CNT(smap_real, dmap_written) \
(((smap_real) ? 1 : 0) + ((dmap_written) ? 1 : 0))
+/*
+ * Removing an initial range of source/donor file's extent and adding a new
+ * extent (from donor/source file) in its place will cause extent count to
+ * increase by 1.
+ */
+#define XFS_IEXT_SWAP_RMAP_CNT (1)
+
/*
* Fork handling.
*/
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 0776abd0103c..b6728fdf50ae 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1407,6 +1407,22 @@ xfs_swap_extent_rmap(
irec.br_blockcount);
trace_xfs_swap_extent_rmap_remap_piece(tip, &uirec);
+ if (xfs_bmap_is_real_extent(&uirec)) {
+ error = xfs_iext_count_may_overflow(ip,
+ XFS_DATA_FORK,
+ XFS_IEXT_SWAP_RMAP_CNT);
+ if (error)
+ goto out;
+ }
+
+ if (xfs_bmap_is_real_extent(&irec)) {
+ error = xfs_iext_count_may_overflow(tip,
+ XFS_DATA_FORK,
+ XFS_IEXT_SWAP_RMAP_CNT);
+ if (error)
+ goto out;
+ }
+
/* Remove the mapping from the donor file. */
xfs_bmap_unmap_extent(tp, tip, &uirec);
--
2.28.0
next prev parent reply other threads:[~2020-10-12 9:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 9:29 [PATCH V6 00/11] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-10-12 9:29 ` [PATCH V6 01/11] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-10-15 8:34 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 02/11] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-10-15 8:34 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 03/11] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-10-15 8:35 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 04/11] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 05/11] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 06/11] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-10-15 8:36 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 07/11] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-10-15 8:37 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 08/11] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-10-15 8:39 ` Christoph Hellwig
2020-10-15 10:01 ` Chandan Babu R
2020-10-15 18:45 ` Darrick J. Wong
2020-10-16 4:27 ` Chandan Babu R
2020-10-16 7:04 ` Christoph Hellwig
2020-10-16 11:28 ` Chandan Babu R
2020-10-16 15:29 ` Darrick J. Wong
2020-10-17 2:55 ` Chandan Babu R
2020-10-12 9:29 ` Chandan Babu R [this message]
2020-10-12 9:29 ` [PATCH V6 10/11] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-10-15 8:40 ` Christoph Hellwig
2020-10-12 9:29 ` [PATCH V6 11/11] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2020-10-15 8:41 ` Christoph Hellwig
2020-10-15 10:02 ` Chandan Babu R
2020-10-15 18:41 ` Darrick J. Wong
2020-10-16 11:31 ` Chandan Babu R
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=20201012092938.50946-10-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.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 NNTP newsgroup(s).