krd/linux
1
0
Fork 0
Code Activity

release 6.12.14

Browse Source
This commit is contained in:
Konstantin Demin
2025-02-17 17:51:15 +03:00
parent e0baaf49dd
commit 92542309fb
13 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
debian/patches/patchset-pf/xfs/0001-xfs-fix-chown-with-rt-quota.patch vendored
View File

@@ -30,7 +30,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -1153,8 +1153,8 @@ xfs_qm_dqusage_adjust(
@@ -1181,8 +1181,8 @@ xfs_qm_dqusage_adjust(
void *data)
{
struct xfs_inode *ip;
@@ -41,7 +41,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
int error;
ASSERT(XFS_IS_QUOTA_ON(mp));
@@ -1191,18 +1191,17 @@ xfs_qm_dqusage_adjust(
@@ -1219,18 +1219,17 @@ xfs_qm_dqusage_adjust(
ASSERT(ip->i_delayed_blks == 0);
@@ -66,7 +66,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/*
* Add the (disk blocks and inode) resources occupied by this
@@ -1858,9 +1857,8 @@ xfs_qm_vop_chown(
@@ -1892,9 +1891,8 @@ xfs_qm_vop_chown(
struct xfs_dquot *newdq)
{
struct xfs_dquot *prevdq;
@@ -78,7 +78,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
xfs_assert_ilocked(ip, XFS_ILOCK_EXCL);
ASSERT(XFS_IS_QUOTA_ON(ip->i_mount));
@@ -1870,11 +1868,17 @@ xfs_qm_vop_chown(
@@ -1904,11 +1902,17 @@ xfs_qm_vop_chown(
ASSERT(prevdq);
ASSERT(prevdq != newdq);
@@ -98,7 +98,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
xfs_trans_mod_ino_dquot(tp, ip, newdq, XFS_TRANS_DQ_ICOUNT, 1);
/*
@@ -1884,7 +1888,8 @@ xfs_qm_vop_chown(
@@ -1918,7 +1922,8 @@ xfs_qm_vop_chown(
* (having already bumped up the real counter) so that we don't have
* any reservation to give back when we commit.
*/
@@ -108,7 +108,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
-ip->i_delayed_blks);
/*
@@ -1896,8 +1901,13 @@ xfs_qm_vop_chown(
@@ -1930,8 +1935,13 @@ xfs_qm_vop_chown(
*/
tp->t_flags |= XFS_TRANS_DIRTY;
xfs_dqlock(prevdq);
@@ -126,7 +126,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/*
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -1254,11 +1254,26 @@ retry:
@@ -1261,11 +1261,26 @@ retry:
gdqp = (new_gdqp != ip->i_gdquot) ? new_gdqp : NULL;
pdqp = (new_pdqp != ip->i_pdquot) ? new_pdqp : NULL;
if (udqp || gdqp || pdqp) {
@@ -153,7 +153,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
/*
* Reserve enough quota to handle blocks on disk and reserved
* for a delayed allocation. We'll actually transfer the
@@ -1266,8 +1281,20 @@ retry:
@@ -1273,8 +1288,20 @@ retry:
* though that part is only semi-transactional.
*/
error = xfs_trans_reserve_quota_bydquots(tp, mp, udqp, gdqp,