From: Bob Peterson rpeterso@redhat.com
[ Upstream commit c9cb9e381985bbbe8acd2695bbe6bd24bf06b81c ]
Before this patch, function gfs2_quota_unlock checked if quotas are turned off, and if so, it branched to label out, which called gfs2_quota_unhold. With the new system of gfs2_qa_get and put, we no longer want to call gfs2_quota_unhold or we won't balance our gets and puts.
Signed-off-by: Bob Peterson rpeterso@redhat.com Signed-off-by: Andreas Gruenbacher agruenba@redhat.com Signed-off-by: Sasha Levin sashal@kernel.org --- fs/gfs2/quota.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 3a31226531ea..4af00ed4960a 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -1080,7 +1080,7 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) int found;
if (!test_and_clear_bit(GIF_QD_LOCKED, &ip->i_flags)) - goto out; + return;
for (x = 0; x < ip->i_res->rs_qa_qd_num; x++) { struct gfs2_quota_data *qd; @@ -1117,7 +1117,6 @@ void gfs2_quota_unlock(struct gfs2_inode *ip) qd_unlock(qda[x]); }
-out: gfs2_quota_unhold(ip); }