From 9ab7b78a13aff5bcb3b76380f551ed5cf4125280 Mon Sep 17 00:00:00 2001 From: Bob Peterson Date: Wed, 28 Jun 2023 07:40:30 -0500 Subject: [PATCH] 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 Signed-off-by: Andreas Gruenbacher --- fs/gfs2/quota.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index d45a3a1..8b6a1c1 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; } -- 2.7.4