[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: ed17f7da5f0c8b65b7b5f7c98beb0aadbc0546ee
WARNING: Author mismatch between patch and upstream commit:
Backport author: Leah Rumancik<leah.rumancik@xxxxxxxxx>
Commit author: Darrick J. Wong<djwong@xxxxxxxxxx>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: d744e578802a)
6.1.y | Present (different SHA1: 1fd830d98732)
Note: The patch differs from the upstream commit:
---
1: ed17f7da5f0c8 ! 1: ac9397950de5e xfs: clean up dqblk extraction
@@ Metadata
## Commit message ##
xfs: clean up dqblk extraction
+ [ Upstream commit ed17f7da5f0c8b65b7b5f7c98beb0aadbc0546ee ]
+
Since the introduction of xfs_dqblk in V5, xfs really ought to find the
dqblk pointer from the dquot buffer, then compute the xfs_disk_dquot
pointer from the dqblk pointer. Fix the open-coded xfs_buf_offset calls
@@ Commit message
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
+ Signed-off-by: Leah Rumancik <leah.rumancik@xxxxxxxxx>
## fs/xfs/xfs_dquot.c ##
@@ fs/xfs/xfs_dquot.c: xfs_dquot_from_disk(
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
