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

Commit b31cfc02 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2/dlm: Add missing dlm_lockres_put()s 



dlm_master_request_handler() forgot to put a lockres when
dlm_assert_master_worker() failed or was skipped.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 52987e2a

fs/ocfs2/dlm/dlmmaster.c

+10 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,12 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
		dlm_put_mle(tmpmle);

	}

send_response:



	/*

	 * __dlm_lookup_lockres() grabbed a reference to this lockres.

	 * The reference is released by dlm_assert_master_worker() under

	 * the call to dlm_dispatch_assert_master().  If

	 * dlm_assert_master_worker() isn't called, we drop it here.

	 */

	if (dispatch_assert) {

		if (response != DLM_MASTER_RESP_YES)

			mlog(ML_ERROR, "invalid response %d\n", response);
@@ -1678,7 +1683,11 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
		if (ret < 0) {

			mlog(ML_ERROR, "failed to dispatch assert master work\n");

			response = DLM_MASTER_RESP_ERROR;

			dlm_lockres_put(res);

		}

	} else {

		if (res)

			dlm_lockres_put(res);

	}



	dlm_put(dlm);