From: Chandan Babu R <chandanrlinux@gmail.com>
To: linux-xfs@vger.kernel.org
Cc: Chandan Babu R <chandanrlinux@gmail.com>,
djwong@kernel.org, hch@lst.de, allison.henderson@oracle.com,
"Darrick J . Wong" <darrick.wong@oracle.com>
Subject: [PATCH V15 11/16] xfs: Check for extent overflow when swapping extents
Date: Tue, 26 Jan 2021 12:02:27 +0530 [thread overview]
Message-ID: <20210126063232.3648053-12-chandanrlinux@gmail.com> (raw)
In-Reply-To: <20210126063232.3648053-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>
Reviewed-by: Allison Henderson <allison.henderson@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 c8f279edc5c1..9e2137cd7372 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -88,6 +88,13 @@ struct xfs_ifork {
*/
#define XFS_IEXT_REFLINK_END_COW_CNT (2)
+/*
+ * 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 6ac7a6ac2658..f3f8c48ff5bf 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1399,6 +1399,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.29.2
next prev parent reply other threads:[~2021-01-26 18:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 6:32 [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 01/16] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 02/16] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 03/16] xfs: Check for extent overflow when punching a hole Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 04/16] xfs: Check for extent overflow when adding dir entries Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 05/16] xfs: Check for extent overflow when removing " Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 06/16] xfs: Check for extent overflow when renaming " Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 07/16] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 08/16] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 09/16] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 10/16] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2021-01-26 6:32 ` Chandan Babu R [this message]
2021-01-26 6:32 ` [PATCH V15 12/16] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 13/16] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 14/16] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2021-01-27 0:39 ` Allison Henderson
2021-01-26 6:32 ` [PATCH V15 15/16] xfs: Process allocated extent " Chandan Babu R
2021-01-26 6:32 ` [PATCH V15 16/16] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
2021-01-28 2:35 ` Allison Henderson
2021-01-26 18:00 ` [PATCH V15 00/16] Bail out if transaction can cause extent count to overflow 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=20210126063232.3648053-12-chandanrlinux@gmail.com \
--to=chandanrlinux@gmail.com \
--cc=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=djwong@kernel.org \
--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