From: Bob Peterson <rpeterso@redhat.com>
Date: Wed, 28 Jun 2023 12:40:30 +0000 (-0500)
Subject: gfs2: simplify slot_get
X-Git-Tag: v6.6.17~3982^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ab7b78a13aff5bcb3b76380f551ed5cf4125280;p=platform%2Fkernel%2Flinux-rpi.git

gfs2: simplify slot_get

Simplify function slot_get and get rid of the goto that jumps into the
middle of an else branch.

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 d45a3a1ed9fe..8b6a1c14a03e 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -342,20 +342,19 @@ static int slot_get(struct gfs2_quota_data *qd)
 	int error = 0;
 
 	spin_lock(&sdp->sd_bitmap_lock);
-	if (qd->qd_slot_count != 0)
-		goto out;
-
-	error = -ENOSPC;
-	bit = find_first_zero_bit(sdp->sd_quota_bitmap, sdp->sd_quota_slots);
-	if (bit < sdp->sd_quota_slots) {
+	if (qd->qd_slot_count == 0) {
+		bit = find_first_zero_bit(sdp->sd_quota_bitmap,
+					  sdp->sd_quota_slots);
+		if (bit >= sdp->sd_quota_slots) {
+			error = -ENOSPC;
+			goto out;
+		}
 		set_bit(bit, sdp->sd_quota_bitmap);
 		qd->qd_slot = bit;
-		error = 0;
-out:
-		qd->qd_slot_count++;
 	}
+	qd->qd_slot_count++;
+out:
 	spin_unlock(&sdp->sd_bitmap_lock);
-
 	return error;
 }