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

Commit 26caee5b authored by Josef Whiter's avatar Josef Whiter Committed by Steven Whitehouse
Browse files

[GFS2] Fix calculation of demote state



If a glock is in the exclusive state and a request for demote to
deferred has been received, then further requests for demote to
shared are being ignored. This patch fixes that by ensuring that
we demote to unlocked in that case.

Signed-off-by: default avatarJosef Whiter <jwhiter@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 87124e58
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -697,8 +697,9 @@ static void handle_callback(struct gfs2_glock *gl, unsigned int state, int remot
			}
			}
			return;
			return;
		}
		}
	} else if (gl->gl_demote_state != LM_ST_UNLOCKED) {
	} else if (gl->gl_demote_state != LM_ST_UNLOCKED &&
		gl->gl_demote_state = state;
			gl->gl_demote_state != state) {
		gl->gl_demote_state = LM_ST_UNLOCKED;
	}
	}
	spin_unlock(&gl->gl_spin);
	spin_unlock(&gl->gl_spin);
}
}