Commit 756b7269 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Zhihao Cheng
Browse files

xfs: hoist multi-fsb allocation unit detection to a helper 

mainline inclusion
from mainline-v6.10-rc1
commit 6b700a5be9b3b69419474622336c63fdc1cc3ca4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9DN5Z
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6b700a5be9b3b69419474622336c63fdc1cc3ca4



--------------------------------

Replace the open-coded logic to decide if a file has a multi-fsb
allocation unit to a helper to make the code easier to read.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Conflicts:
	fs/xfs/xfs_bmap_util.c
[ 5f57f7309d9ab9("xfs: create rt extent rounding helpers for realtime
  extent blocks") is not applied. ]
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarZhihao Cheng <chengzhihao@huaweicloud.com>
parent da3d113d

fs/xfs/xfs_bmap_util.c

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ xfs_can_free_eofblocks( 
	 * forever.

	 */

	end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_ISIZE(ip));

	if (XFS_IS_REALTIME_INODE(ip) && mp->m_sb.sb_rextsize > 1)

	if (xfs_inode_has_bigrtalloc(ip))

		end_fsb = roundup_64(end_fsb, mp->m_sb.sb_rextsize);

	last_fsb = XFS_B_TO_FSB(mp, mp->m_super->s_maxbytes);

	if (last_fsb <= end_fsb)
@@ -990,7 +990,7 @@ xfs_free_file_space( 
	endoffset_fsb = XFS_B_TO_FSBT(mp, offset + len);



	/* We can only free complete realtime extents. */

	if (XFS_IS_REALTIME_INODE(ip) && mp->m_sb.sb_rextsize > 1) {

	if (xfs_inode_has_bigrtalloc(ip)) {

		startoffset_fsb = roundup_64(startoffset_fsb,

					     mp->m_sb.sb_rextsize);

		endoffset_fsb = rounddown_64(endoffset_fsb,

fs/xfs/xfs_inode.h

+9 −0
Original line number Diff line number Diff line
@@ -305,6 +305,15 @@ static inline bool xfs_inode_has_large_extent_counts(struct xfs_inode *ip) 
	return ip->i_diflags2 & XFS_DIFLAG2_NREXT64;

}



/*

 * Decide if this file is a realtime file whose data allocation unit is larger

 * than a single filesystem block.

 */

static inline bool xfs_inode_has_bigrtalloc(struct xfs_inode *ip)

{

	return XFS_IS_REALTIME_INODE(ip) && ip->i_mount->m_sb.sb_rextsize > 1;

}



/*

 * Return the buftarg used for data allocations on a given inode.

 */