[Cluster-devel] [PATCH] gfs2: simplify gdlm_put_lock with out_free label

[Bob Peterson]

No change in function. This patch introduces a new label out_free and
consolidates the three places function gdlm_put_lock freed the glock.

Signed-off-by: Bob Peterson <rpete...@redhat.com>
---
 fs/gfs2/lock_dlm.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 71911bf9ab34..54911294687c 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -296,10 +296,8 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
        struct lm_lockstruct *ls = &sdp->sd_lockstruct;
        int error;
 
-       if (gl->gl_lksb.sb_lkid == 0) {
-               gfs2_glock_free(gl);
-               return;
-       }
+       if (gl->gl_lksb.sb_lkid == 0)
+               goto out_free;
 
        clear_bit(GLF_BLOCKING, &gl->gl_flags);
        gfs2_glstats_inc(gl, GFS2_LKS_DCOUNT);
@@ -307,17 +305,13 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
        gfs2_update_request_times(gl);
 
        /* don't want to call dlm if we've unmounted the lock protocol */
-       if (test_bit(DFL_UNMOUNT, &ls->ls_recover_flags)) {
-               gfs2_glock_free(gl);
-               return;
-       }
+       if (test_bit(DFL_UNMOUNT, &ls->ls_recover_flags))
+               goto out_free;
        /* don't want to skip dlm_unlock writing the lvb when lock has one */
 
        if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) &&
-           !gl->gl_lksb.sb_lvbptr) {
-               gfs2_glock_free(gl);
-               return;
-       }
+           !gl->gl_lksb.sb_lvbptr)
+               goto out_free;
 
 again:
        error = dlm_unlock(ls->ls_dlm, gl->gl_lksb.sb_lkid, DLM_LKF_VALBLK,
@@ -331,8 +325,11 @@ static void gdlm_put_lock(struct gfs2_glock *gl)
                fs_err(sdp, "gdlm_unlock %x,%llx err=%d\n",
                       gl->gl_name.ln_type,
                       (unsigned long long)gl->gl_name.ln_number, error);
-               return;
        }
+       return;
+
+out_free:
+       gfs2_glock_free(gl);
 }
 
 static void gdlm_cancel(struct gfs2_glock *gl)
-- 
2.40.0