[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: af5d92f2fad818663da2ce073b6fe15b9d56ffdc
WARNING: Author mismatch between patch and upstream commit: Backport author: Catherine Hoang catherine.hoang@oracle.com Commit author: Julian Sun sunjunchao2870@gmail.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: af5d92f2fad8 ! 1: 9ba6eacedd6d xfs: remove unused parameter in macro XFS_DQUOT_LOGRES @@ Metadata ## Commit message ## xfs: remove unused parameter in macro XFS_DQUOT_LOGRES
+ commit af5d92f2fad818663da2ce073b6fe15b9d56ffdc upstream. + In the macro definition of XFS_DQUOT_LOGRES, a parameter is accepted, but it is not used. Hence, it should be removed.
@@ Commit message Signed-off-by: Julian Sun sunjunchao2870@gmail.com Reviewed-by: Darrick J. Wong djwong@kernel.org Signed-off-by: Chandan Babu R chandanbabu@kernel.org + Signed-off-by: Catherine Hoang catherine.hoang@oracle.com + Acked-by: Darrick J. Wong djwong@kernel.org
## fs/xfs/libxfs/xfs_quota_defs.h ## @@ fs/xfs/libxfs/xfs_quota_defs.h: typedef uint8_t xfs_dqtype_t; @@ fs/xfs/libxfs/xfs_trans_resv.c: STATIC uint xfs_calc_rename_reservation( struct xfs_mount *mp) { -- unsigned int overhead = XFS_DQUOT_LOGRES(mp); -+ unsigned int overhead = XFS_DQUOT_LOGRES; - struct xfs_trans_resv *resp = M_RES(mp); - unsigned int t1, t2, t3 = 0; - +- return XFS_DQUOT_LOGRES(mp) + ++ return XFS_DQUOT_LOGRES + + max((xfs_calc_inode_res(mp, 5) + + xfs_calc_buf_res(2 * XFS_DIROP_LOG_COUNT(mp), + XFS_FSB_TO_B(mp, 1))), @@ fs/xfs/libxfs/xfs_trans_resv.c: STATIC uint xfs_calc_link_reservation( struct xfs_mount *mp) { -- unsigned int overhead = XFS_DQUOT_LOGRES(mp); -+ unsigned int overhead = XFS_DQUOT_LOGRES; - struct xfs_trans_resv *resp = M_RES(mp); - unsigned int t1, t2, t3 = 0; - +- return XFS_DQUOT_LOGRES(mp) + ++ return XFS_DQUOT_LOGRES + + xfs_calc_iunlink_remove_reservation(mp) + + max((xfs_calc_inode_res(mp, 2) + + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), @@ fs/xfs/libxfs/xfs_trans_resv.c: STATIC uint xfs_calc_remove_reservation( struct xfs_mount *mp) { -- unsigned int overhead = XFS_DQUOT_LOGRES(mp); -+ unsigned int overhead = XFS_DQUOT_LOGRES; - struct xfs_trans_resv *resp = M_RES(mp); - unsigned int t1, t2, t3 = 0; - -@@ fs/xfs/libxfs/xfs_trans_resv.c: xfs_calc_icreate_reservation( - struct xfs_mount *mp) +- return XFS_DQUOT_LOGRES(mp) + ++ return XFS_DQUOT_LOGRES + + xfs_calc_iunlink_add_reservation(mp) + + max((xfs_calc_inode_res(mp, 2) + + xfs_calc_buf_res(XFS_DIROP_LOG_COUNT(mp), +@@ fs/xfs/libxfs/xfs_trans_resv.c: xfs_calc_icreate_resv_alloc( + STATIC uint + xfs_calc_icreate_reservation(xfs_mount_t *mp) { - struct xfs_trans_resv *resp = M_RES(mp); -- unsigned int overhead = XFS_DQUOT_LOGRES(mp); -+ unsigned int overhead = XFS_DQUOT_LOGRES; - unsigned int t1, t2, t3 = 0; - - t1 = xfs_calc_icreate_resv_alloc(mp); +- return XFS_DQUOT_LOGRES(mp) + ++ return XFS_DQUOT_LOGRES + + max(xfs_calc_icreate_resv_alloc(mp), + xfs_calc_create_resv_modify(mp)); + } @@ fs/xfs/libxfs/xfs_trans_resv.c: STATIC uint xfs_calc_create_tmpfile_reservation( struct xfs_mount *mp) ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |