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

Commit aad1b153 authored by Tiger Yang's avatar Tiger Yang Committed by Joel Becker
Browse files

ocfs2: return -EAGAIN instead of EAGAIN in dlm 



We used to return positive EAGAIN to indicate a retry action
is needed in dlm_begin_reco_handler(). Now we return negative
-EAGAIN to erase the confusion caused by this error code.

Signed-off-by: default avatarTiger Yang <tiger.yang@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent f6656d26

fs/ocfs2/dlm/dlmrecovery.c

+9 −9
Original line number Diff line number Diff line
@@ -2589,6 +2589,14 @@ 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) {

			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,

			     dead_node, nodenum);

			msleep(100);

			goto retry;

		}

		if (ret < 0) {

			struct dlm_lock_resource *res;

			/* this is now a serious problem, possibly ENOMEM
@@ -2608,14 +2616,6 @@ static int dlm_send_begin_reco_message(struct dlm_ctxt *dlm, u8 dead_node) 
			 * another ENOMEM */

			msleep(100);

			goto retry;

		} else if (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,

			     dead_node, nodenum);

			/* TODO Look into replacing msleep with cond_resched() */

			msleep(100);

			goto retry;

		}

	}
@@ -2639,7 +2639,7 @@ int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data, 
		     dlm->name, br->node_idx, br->dead_node,

		     dlm->reco.dead_node, dlm->reco.new_master);

		spin_unlock(&dlm->spinlock);

		return EAGAIN;

		return -EAGAIN;

	}

	spin_unlock(&dlm->spinlock);