Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45e72af0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes 

Pull GFS2 fix from Steven Whitehouse.

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
  GFS2: fix skip unlock condition
parents ae2c3d95 d4e0bfec

fs/gfs2/lock_dlm.c

+6 −1
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ static void gdlm_put_lock(struct gfs2_glock *gl) 
{

	struct gfs2_sbd *sdp = gl->gl_sbd;

	struct lm_lockstruct *ls = &sdp->sd_lockstruct;

	int lvb_needs_unlock = 0;

	int error;



	if (gl->gl_lksb.sb_lkid == 0) {
@@ -294,8 +295,12 @@ static void gdlm_put_lock(struct gfs2_glock *gl) 
	gfs2_update_request_times(gl);



	/* don't want to skip dlm_unlock writing the lvb when lock is ex */



	if (gl->gl_lksb.sb_lvbptr && (gl->gl_state == LM_ST_EXCLUSIVE))

		lvb_needs_unlock = 1;



	if (test_bit(SDF_SKIP_DLM_UNLOCK, &sdp->sd_flags) &&

	    gl->gl_lksb.sb_lvbptr && (gl->gl_state != LM_ST_EXCLUSIVE)) {

	    !lvb_needs_unlock) {

		gfs2_glock_free(gl);

		return;

	}