[Cluster-devel] [PATCH 06/12] GFS2: Unlock rindex mutex on glock error

[Steven Whitehouse]

From: Bob Peterson <rpete...@redhat.com>

This patch fixes an error path in function gfs2_rindex_update
that leaves the rindex mutex held.

Signed-off-by: Bob Peterson <rpete...@redhat.com>
Signed-off-by: Steven Whitehouse <swhit...@redhat.com>

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 1446b4e..e09370e 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -699,13 +699,14 @@ int gfs2_rindex_update(struct gfs2_sbd *sdp)
                if (!gfs2_glock_is_locked_by_me(gl)) {
                        error = gfs2_glock_nq_init(gl, LM_ST_SHARED, 0, &ri_gh);
                        if (error)
-                               return error;
+                               goto out_unlock;
                        unlock_required = 1;
                }
                if (!sdp->sd_rindex_uptodate)
                        error = gfs2_ri_update(ip);
                if (unlock_required)
                        gfs2_glock_dq_uninit(&ri_gh);
+out_unlock:
                mutex_unlock(&sdp->sd_rindex_mutex);
        }
 
-- 
1.7.4