From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 22 Jun 2023 17:36:59 +0000 (-0500)
Subject: gfs2: Remove quota allocation info from quota file
X-Git-Tag: v6.6.17~3982^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3932e5073011567d24ce66cf66575d4d81ea8c94;p=platform%2Fkernel%2Flinux-rpi.git

gfs2: Remove quota allocation info from quota file

Function do_sync called gfs2_qa_get and put for quota allocation data.
But the inode in question is the system master quota file, which is
never subject to quotas. Therefore, a qa structure should be unnecessary
and if anything accesses it, it's probably a bug.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 9c72342..ecadbcd 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -905,18 +905,12 @@ static int do_sync(unsigned int num_qd, struct gfs2_quota_data **qda)
 	unsigned int nalloc = 0, blocks;
 	int error;
 
-	error = gfs2_qa_get(ip);
-	if (error)
-		return error;
-
 	gfs2_write_calc_reserv(ip, sizeof(struct gfs2_quota),
 			      &data_blocks, &ind_blocks);
 
 	ghs = kmalloc_array(num_qd, sizeof(struct gfs2_holder), GFP_NOFS);
-	if (!ghs) {
-		error = -ENOMEM;
-		goto out;
-	}
+	if (!ghs)
+		return -ENOMEM;
 
 	sort(qda, num_qd, sizeof(struct gfs2_quota_data *), sort_qd, NULL);
 	inode_lock(&ip->i_inode);
@@ -989,8 +983,6 @@ out_dq:
 	kfree(ghs);
 	gfs2_log_flush(ip->i_gl->gl_name.ln_sbd, ip->i_gl,
 		       GFS2_LOG_HEAD_FLUSH_NORMAL | GFS2_LFC_DO_SYNC);
-out:
-	gfs2_qa_put(ip);
 	if (!error) {
 		for (x = 0; x < num_qd; x++)
 			qda[x]->qd_sync_gen = sdp->sd_quota_sync_gen;