gfs2: Allow ASPACE glocks to also have an lvb

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index bf70e3b14938e0698557c44ba414078f8f6b986e..86e9e621f346a3af8b6f418525d2398fc99a0410 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -125,12 +125,11 @@ static void gfs2_glock_dealloc(struct rcu_head *rcu)
 {
        struct gfs2_glock *gl = container_of(rcu, struct gfs2_glock, gl_rcu);
 
-       if (gl->gl_ops->go_flags & GLOF_ASPACE) {
+       kfree(gl->gl_lksb.sb_lvbptr);
+       if (gl->gl_ops->go_flags & GLOF_ASPACE)
                kmem_cache_free(gfs2_glock_aspace_cachep, gl);
-       } else {
-               kfree(gl->gl_lksb.sb_lvbptr);
+       else
                kmem_cache_free(gfs2_glock_cachep, gl);
-       }
 }
 
 /**