From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Sat, 9 Nov 2019 20:04:30 +0000 (-0800)
Subject: xfs: attach dquots before performing xfs_swap_extents
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2713fefa5dd511b18ddc73b978273eec3ae08f6d;p=linux.git

xfs: attach dquots before performing xfs_swap_extents

Make sure we attach dquots to both inodes before swapping their extents.
This was found via manual code inspection by looking for places where we
could call xfs_trans_mod_dquot without dquots attached to inodes, and
confirmed by instrumenting the kernel and running xfs/328.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 9d731b71e84ff..2efd78a9719ea 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1569,6 +1569,14 @@ xfs_swap_extents(
 		goto out_unlock;
 	}
 
+	error = xfs_qm_dqattach(ip);
+	if (error)
+		goto out_unlock;
+
+	error = xfs_qm_dqattach(tip);
+	if (error)
+		goto out_unlock;
+
 	error = xfs_swap_extent_flush(ip);
 	if (error)
 		goto out_unlock;