Commit cd34edd8 authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

ocfs2/dlm: Handle EAGAIN for compatibility - v2 



Mainline commit aad1b153 made the
dlm_begin_reco_handler() return -EAGAIN instead of EAGAIN.

As this error is transmitted over the wire, we want the receiver,
dlm_send_begin_reco_message(), to understand both the older EAGAIN and
the newer -EAGAIN, to allow rolling upgrade of the cluster nodes.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 60c48674

fs/ocfs2/dlm/dlmrecovery.c

+7 −1
Original line number Diff line number Diff line
@@ -2639,7 +2639,13 @@ static int dlm_send_begin_reco_message(struct dlm_ctxt *dlm, u8 dead_node) 
			     "begin reco msg (%d)\n", dlm->name, nodenum, ret);

			ret = 0;

		}

		if (ret == -EAGAIN) {



		/*

		 * Prior to commit aad1b15310b9bcd59fa81ab8f2b1513b59553ea8,

		 * dlm_begin_reco_handler() returned EAGAIN and not -EAGAIN.

		 * We are handling both for compatibility reasons.

		 */

		if (ret == -EAGAIN || ret == EAGAIN) {

			mlog(0, "%s: trying to start recovery of node "

			     "%u, but node %u is waiting for last recovery "

			     "to complete, backoff for a bit\n", dlm->name,