Commit e10249b1 authored Nov 02, 2021 by Alexander Aring Committed by David Teigland Nov 02, 2021

fs: dlm: use dlm_recovery_stopped in condition



This patch will change to evaluate the dlm_recovery_stopped() in the
condition of the if branch instead fetch it before evaluating the
condition. As this is an atomic test-set operation it should be
evaluated in the condition itself.

Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

parent 3e973671

fs/dlm/dir.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -84,8 +84,7 @@ int dlm_recover_directory(struct dlm_ls *ls)

		for (;;) {
		int left;
		error = dlm_recovery_stopped(ls);
		if (error) {
		if (dlm_recovery_stopped(ls)) {
		error = -EINTR;
		goto out_free;
		}

fs/dlm/member.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -442,8 +442,7 @@ static int ping_members(struct dlm_ls *ls)
		int error = 0;

		list_for_each_entry(memb, &ls->ls_nodes, list) {
		error = dlm_recovery_stopped(ls);
		if (error) {
		if (dlm_recovery_stopped(ls)) {
		error = -EINTR;
		break;
		}

fs/dlm/recoverd.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,7 @@ static int ls_recover(struct dlm_ls ls, struct dlm_recover rv)

		dlm_recover_waiters_pre(ls);

		error = dlm_recovery_stopped(ls);
		if (error) {
		if (dlm_recovery_stopped(ls)) {
		error = -EINTR;
		goto fail;
		}