From a4d22e337d022d7bb8da25c18629bac2af24ec81 Mon Sep 17 00:00:00 2001 From: Bob Peterson Date: Fri, 16 Jun 2023 12:36:51 -0500 Subject: [PATCH] gfs2: move qdsb_put and reduce redundancy This patch looks more invasive than it is. It simply moves function qdsb_put before qd_unlock, then changes qd_unlock to call it rather than open coding it. Again, this reduces redundancy. Signed-off-by: Bob Peterson Signed-off-by: Andreas Gruenbacher --- fs/gfs2/quota.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 9be210f3dbd8..21100feb1db7 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -509,13 +509,18 @@ static int qd_fish(struct gfs2_sbd *sdp, struct gfs2_quota_data **qdp) return 0; } +static void qdsb_put(struct gfs2_quota_data *qd) +{ + bh_put(qd); + slot_put(qd); + qd_put(qd); +} + static void qd_unlock(struct gfs2_quota_data *qd) { gfs2_assert_warn(qd->qd_sbd, test_bit(QDF_LOCKED, &qd->qd_flags)); clear_bit(QDF_LOCKED, &qd->qd_flags); - bh_put(qd); - slot_put(qd); - qd_put(qd); + qdsb_put(qd); } static int qdsb_get(struct gfs2_sbd *sdp, struct kqid qid, @@ -544,13 +549,6 @@ static int qdsb_get(struct gfs2_sbd *sdp, struct kqid qid, return error; } -static void qdsb_put(struct gfs2_quota_data *qd) -{ - bh_put(qd); - slot_put(qd); - qd_put(qd); -} - /** * gfs2_qa_get - make sure we have a quota allocations data structure, * if necessary