From: Bob Peterson <rpeterso@redhat.com>
Date: Tue, 5 May 2020 16:52:51 +0000 (-0500)
Subject: gfs2: remove check for quotas on in gfs2_quota_check
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6ce26e571a813e6992c5148b27f2a4b17952080;p=openwrt%2Fstaging%2Fblogic.git

gfs2: remove check for quotas on in gfs2_quota_check

This patch removes a check from gfs2_quota_check for whether quotas
are enabled by the superblock. There is a test just prior for the
GIF_QD_LOCKED bit in the inode, and that can only be set by functions
that already check that quotas are enabled in the superblock.
Therefore, the check is redundant.

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 a62be4267c17..c997cadc8d9a 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -1210,9 +1210,6 @@ int gfs2_quota_check(struct gfs2_inode *ip, kuid_t uid, kgid_t gid,
 	if (!test_bit(GIF_QD_LOCKED, &ip->i_flags))
 		return 0;
 
-        if (sdp->sd_args.ar_quota != GFS2_QUOTA_ON)
-                return 0;
-
 	for (x = 0; x < ip->i_qadata->qa_qd_num; x++) {
 		qd = ip->i_qadata->qa_qd[x];