Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: support the COW fork in xfs_bmap_punch_delalloc_range

Browse Source 
xfs_buffered_write_iomap_begin can also create delallocate reservations
that need cleaning up, prepare for that by adding support for the COW
fork in xfs_bmap_punch_delalloc_range.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2024-10-08 10:59:18 +02:00 committed by Carlos Maiolino
parent abd7d651ad
commit 8fe3b21efa
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_aops.c
View File

@ -116,7 +116,7 @@ xfs_end_ioend(
if (unlikely(error)) { if (unlikely(error)) {
if (ioend->io_flags & IOMAP_F_SHARED) { if (ioend->io_flags & IOMAP_F_SHARED) {
xfs_reflink_cancel_cow_range(ip, offset, size, true); xfs_reflink_cancel_cow_range(ip, offset, size, true);
xfs_bmap_punch_delalloc_range(ip, offset, xfs_bmap_punch_delalloc_range(ip, XFS_DATA_FORK, offset,
offset + size); offset + size);
} }
goto done; goto done;
@ -456,7 +456,7 @@ xfs_discard_folio(
* byte of the next folio. Hence the end offset is only dependent on the * byte of the next folio. Hence the end offset is only dependent on the
* folio itself and not the start offset that is passed in. * folio itself and not the start offset that is passed in.
*/ */
xfs_bmap_punch_delalloc_range(ip, pos, xfs_bmap_punch_delalloc_range(ip, XFS_DATA_FORK, pos,
folio_pos(folio) + folio_size(folio)); folio_pos(folio) + folio_size(folio));
} }

10
fs/xfs/xfs_bmap_util.c
View File

@ -442,11 +442,12 @@ out_unlock_iolock:
void void
xfs_bmap_punch_delalloc_range( xfs_bmap_punch_delalloc_range(
struct xfs_inode *ip, struct xfs_inode *ip,
int whichfork,
xfs_off_t start_byte, xfs_off_t start_byte,
xfs_off_t end_byte) xfs_off_t end_byte)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct xfs_ifork *ifp = &ip->i_df; struct xfs_ifork *ifp = xfs_ifork_ptr(ip, whichfork);
xfs_fileoff_t start_fsb = XFS_B_TO_FSBT(mp, start_byte); xfs_fileoff_t start_fsb = XFS_B_TO_FSBT(mp, start_byte);
xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, end_byte); xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, end_byte);
struct xfs_bmbt_irec got, del; struct xfs_bmbt_irec got, del;
@ -474,11 +475,14 @@ xfs_bmap_punch_delalloc_range(
continue; continue;
} }
xfs_bmap_del_extent_delay(ip, XFS_DATA_FORK, &icur, &got, &del); xfs_bmap_del_extent_delay(ip, whichfork, &icur, &got, &del);
if (!xfs_iext_get_extent(ifp, &icur, &got)) if (!xfs_iext_get_extent(ifp, &icur, &got))
break; break;
} }
if (whichfork == XFS_COW_FORK && !ifp->if_bytes)
xfs_inode_clear_cowblocks_tag(ip);
out_unlock: out_unlock:
xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_iunlock(ip, XFS_ILOCK_EXCL);
} }
@ -580,7 +584,7 @@ xfs_free_eofblocks(
*/ */
if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) { if (ip->i_diflags & (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) {
if (ip->i_delayed_blks) { if (ip->i_delayed_blks) {
xfs_bmap_punch_delalloc_range(ip, xfs_bmap_punch_delalloc_range(ip, XFS_DATA_FORK,
round_up(XFS_ISIZE(ip), mp->m_sb.sb_blocksize), round_up(XFS_ISIZE(ip), mp->m_sb.sb_blocksize),
LLONG_MAX); LLONG_MAX);
} }

2
fs/xfs/xfs_bmap_util.h
View File

@ -30,7 +30,7 @@ xfs_bmap_rtalloc(struct xfs_bmalloca *ap)
} }
#endif /* CONFIG_XFS_RT */ #endif /* CONFIG_XFS_RT */
void xfs_bmap_punch_delalloc_range(struct xfs_inode *ip, void xfs_bmap_punch_delalloc_range(struct xfs_inode *ip, int whichfork,
xfs_off_t start_byte, xfs_off_t end_byte); xfs_off_t start_byte, xfs_off_t end_byte);
struct kgetbmap { struct kgetbmap {

3
fs/xfs/xfs_iomap.c
View File

@ -1215,7 +1215,8 @@ xfs_buffered_write_delalloc_punch(
loff_t length, loff_t length,
struct iomap *iomap) struct iomap *iomap)
{ {
xfs_bmap_punch_delalloc_range(XFS_I(inode), offset, offset + length); xfs_bmap_punch_delalloc_range(XFS_I(inode), XFS_DATA_FORK, offset,
offset + length);
} }
static int static int