From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org
Subject: [PATCH 07/22] xfs: remove xfs_reflink_trim_irec_to_next_cow
Date: Mon, 2 Jul 2018 08:57:58 -0600 [thread overview]
Message-ID: <20180702145813.22496-8-hch@lst.de> (raw)
In-Reply-To: <20180702145813.22496-1-hch@lst.de>
We already have to check for overlapping COW extents everytime we
come back to a page in xfs_writepage_map / xfs_map_cow, so this
additional trim is not required.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_aops.c | 7 -------
fs/xfs/xfs_reflink.c | 33 ---------------------------------
fs/xfs/xfs_reflink.h | 2 --
fs/xfs/xfs_trace.h | 1 -
4 files changed, 43 deletions(-)
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 6b6150683343..08605432c497 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -404,13 +404,6 @@ xfs_map_blocks(
offset_fsb = XFS_B_TO_FSBT(mp, offset);
error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb,
imap, &nimaps, XFS_BMAPI_ENTIRE);
- /*
- * Truncate an overwrite extent if there's a pending CoW
- * reservation before the end of this extent. This forces us
- * to come back to writepage to take care of the CoW.
- */
- if (nimaps && type == XFS_IO_OVERWRITE)
- xfs_reflink_trim_irec_to_next_cow(ip, offset_fsb, imap);
xfs_iunlock(ip, XFS_ILOCK_SHARED);
if (error)
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 592fb2071a03..22c11b98ab26 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -500,39 +500,6 @@ xfs_reflink_find_cow_mapping(
return true;
}
-/*
- * Trim an extent to end at the next CoW reservation past offset_fsb.
- */
-void
-xfs_reflink_trim_irec_to_next_cow(
- struct xfs_inode *ip,
- xfs_fileoff_t offset_fsb,
- struct xfs_bmbt_irec *imap)
-{
- struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
- struct xfs_bmbt_irec got;
- struct xfs_iext_cursor icur;
-
- if (!xfs_is_reflink_inode(ip))
- return;
-
- /* Find the extent in the CoW fork. */
- if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &icur, &got))
- return;
-
- /* This is the extent before; try sliding up one. */
- if (got.br_startoff < offset_fsb) {
- if (!xfs_iext_next_extent(ifp, &icur, &got))
- return;
- }
-
- if (got.br_startoff >= imap->br_startoff + imap->br_blockcount)
- return;
-
- imap->br_blockcount = got.br_startoff - imap->br_startoff;
- trace_xfs_reflink_trim_irec(ip, imap);
-}
-
/*
* Cancel CoW reservations for some block range of an inode.
*
diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index 1532827ba911..6f9f98894abc 100644
--- a/fs/xfs/xfs_reflink.h
+++ b/fs/xfs/xfs_reflink.h
@@ -20,8 +20,6 @@ extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,
xfs_off_t count);
extern bool xfs_reflink_find_cow_mapping(struct xfs_inode *ip, xfs_off_t offset,
struct xfs_bmbt_irec *imap);
-extern void xfs_reflink_trim_irec_to_next_cow(struct xfs_inode *ip,
- xfs_fileoff_t offset_fsb, struct xfs_bmbt_irec *imap);
extern int xfs_reflink_cancel_cow_blocks(struct xfs_inode *ip,
struct xfs_trans **tpp, xfs_fileoff_t offset_fsb,
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 972d45d28097..a5b01529ecf6 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -3216,7 +3216,6 @@ DEFINE_RW_EVENT(xfs_reflink_reserve_cow);
DEFINE_SIMPLE_IO_EVENT(xfs_reflink_bounce_dio_write);
DEFINE_IOMAP_EVENT(xfs_reflink_find_cow_mapping);
-DEFINE_INODE_IREC_EVENT(xfs_reflink_trim_irec);
DEFINE_SIMPLE_IO_EVENT(xfs_reflink_cancel_cow_range);
DEFINE_SIMPLE_IO_EVENT(xfs_reflink_end_cow);
--
2.18.0
next prev parent reply other threads:[~2018-07-02 14:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 14:57 stop using buffer heads in xfs v7 Christoph Hellwig
2018-07-02 14:57 ` [PATCH 01/22] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Christoph Hellwig
2018-07-02 14:57 ` [PATCH 02/22] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-07-02 14:57 ` [PATCH 03/22] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-07-02 14:57 ` [PATCH 04/22] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-07-02 14:57 ` [PATCH 05/22] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-07-02 14:57 ` [PATCH 06/22] xfs: don't use XFS_BMAPI_IGSTATE in xfs_map_blocks Christoph Hellwig
2018-07-02 14:57 ` Christoph Hellwig [this message]
2018-07-02 14:57 ` [PATCH 08/22] xfs: remove xfs_map_cow Christoph Hellwig
2018-07-02 14:58 ` [PATCH 09/22] xfs: rename the offset variable in xfs_writepage_map Christoph Hellwig
2018-07-02 14:58 ` [PATCH 10/22] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-07-02 14:58 ` [PATCH 11/22] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-07-02 14:58 ` [PATCH 12/22] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-07-02 14:58 ` [PATCH 13/22] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-07-02 14:58 ` [PATCH 14/22] xfs: remove the imap_valid flag Christoph Hellwig
2018-07-02 14:58 ` [PATCH 15/22] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-07-02 14:58 ` [PATCH 16/22] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-07-02 14:58 ` [PATCH 17/22] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-07-02 14:58 ` [PATCH 18/22] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-07-02 14:58 ` [PATCH 19/22] xfs: allow writeback on pages without buffer heads Christoph Hellwig
2018-07-02 14:58 ` [PATCH 20/22] iomap: add support for sub-pagesize buffered I/O " Christoph Hellwig
2018-07-03 12:31 ` Brian Foster
2018-07-03 21:52 ` Darrick J. Wong
2018-07-02 14:58 ` [PATCH 21/22] xfs: add support for sub-pagesize writeback without buffer_heads Christoph Hellwig
2018-07-03 12:36 ` Brian Foster
2018-07-03 22:05 ` Darrick J. Wong
2018-07-08 15:16 ` Christoph Hellwig
2018-07-10 1:02 ` Brian Foster
2018-07-10 12:15 ` Christoph Hellwig
2018-07-11 10:58 ` Brian Foster
2018-07-02 14:58 ` [PATCH 22/22] xfs: update my copyrights for the writeback and iomap code Christoph Hellwig
2018-07-03 12:36 ` Brian Foster
2018-07-03 21:51 ` 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=20180702145813.22496-8-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--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).