xfs: simplify sector number calculation in xfs_zero_extent
PATCH 1/1 xfs: simplify sector number calculation in xfs_zero_extent
xfs_zero_extent does some really odd gymnstics to calculate the block layer sectors numbers passed to blkdev_issue_zeroout. This is because it used to call sb_issue_zeroout and the calculations in that helper got open coded here in the rather misleadingly named commit 3dc29161070a ("dax: use sb_issue_zerout instead of calling dax_clear_sectors").
--- fs/xfs/xfs_bmap_util.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
fs/xfs/xfs_bmap_util.c +4 -13
@@ -49,10 +49,6 @@ xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)/* * Routine to zero an extent on disk allocated to the specific inode. -* -* The VFS functions take a linearised filesystem block offset, so we have to -* convert the sparse xfs fsb to the right format first. -* VFS types are real funky, too. */ int xfs_zero_extent(
@@ -60,15 +56,10 @@ xfs_zero_extent( xfs_fsblock_t start_fsb, xfs_off_t count_fsb) { -struct xfs_mount *mp = ip->i_mount; -struct xfs_buftarg *target =xfs_inode_buftarg (ip); -xfs_daddr_t sector =xfs_fsb_to_db (ip, start_fsb); -sector_t block =XFS_BB_TO_FSBT (mp, sector); - -return blkdev_issue_zeroout (target->bt_bdev, - block << (mp->m_super->s_blocksize_bits -9 ), - count_fsb << (mp->m_super->s_blocksize_bits -9 ), -GFP_KERNEL ,0 ); +return blkdev_issue_zeroout (xfs_inode_buftarg (ip)->bt_bdev, +xfs_fsb_to_db (ip, start_fsb), +XFS_FSB_TO_BB (ip->i_mount, count_fsb), +GFP_KERNEL ,0 ); }/*
Signature · 1 line
2.45.2
Quoted 28 lines · Christoph Hellwig
xfs_zero_extentdoes some really odd gymnstics to calculate the block layer sectors numbers passed toblkdev_issue_zeroout. This is because it used to callsb_issue_zerooutand the calculations in that helper got open coded here in the rather misleadingly named commit3dc29161070a("dax: usesb_issue_zeroutinstead of callingdax_clear_sectors").Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/xfs_bmap_util.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)fs/xfs/xfs_bmap_util.c +0
-4@@ -49,10 +49,6 @@ xfs_fsb_to_db(struct xfs_inode *ip, xfs_fsblock_t fsb)/* * Routine to zero an extent on disk allocated to the specific inode. -* -* The VFS functions take a linearised filesystem block offset, so we have to -* convert the sparse xfs fsb to the right format first. -* VFS types are real funky, too. */ int xfs_zero_extent(@@ -60,15 +56,10 @@ xfs_zero_extent( xfs_fsblock_t start_fsb,
fs/xfs/xfs_bmap_util.c xfs_zero_extent( · line 70
Quoted 10 lines
fs/xfs/xfs_bmap_util.c +0
-8xfs_off_t count_fsb) { -struct xfs_mount *mp = ip->i_mount; -struct xfs_buftarg *target =xfs_inode_buftarg (ip); -xfs_daddr_t sector =xfs_fsb_to_db (ip, start_fsb); -sector_t block =XFS_BB_TO_FSBT (mp, sector); - - return blkdev_issue_zeroout(target->bt_bdev, - block << (mp->m_super->s_blocksize_bits - 9), - count_fsb << (mp->m_super->s_blocksize_bits - 9),
Groossssss, this is a good cleanup.
--D
Quoted 12 lines
fs/xfs/xfs_bmap_util.c +4
-1- GFP_KERNEL, 0); +return blkdev_issue_zeroout (xfs_inode_buftarg (ip)->bt_bdev, +xfs_fsb_to_db (ip, start_fsb), +XFS_FSB_TO_BB (ip->i_mount, count_fsb), +GFP_KERNEL ,0 ); }/* Signature · 1 line
2.45.2
Quoted 7 lines · Christoph Hellwig
xfs_zero_extentdoes some really odd gymnstics to calculate the block layer sectors numbers passed toblkdev_issue_zeroout. This is because it used to callsb_issue_zerooutand the calculations in that helper got open coded here in the rather misleadingly named commit3dc29161070a("dax: usesb_issue_zeroutinstead of callingdax_clear_sectors").Signed-off-by Christoph Hellwig<[email protected]>
much cleaner like what xfs_discard_rtdev_extents() and xfs_discard_extents()
is doing. Looks good.
-ck