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

Commit f08736bd authored by Joseph Qi's avatar Joseph Qi Committed by Linus Torvalds
Browse files

ocfs2/dlm: let sender retry if dlm_dispatch_assert_master failed with -ENOMEM 



Do not BUG() if GFP_ATOMIC allocation fails in dlm_dispatch_assert_master.
Instead, return -ENOMEM to the sender and then retry.

Signed-off-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Reviewed-by: default avatarAlex Chen <alex.chen@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ded00142

fs/ocfs2/dlm/dlmrecovery.c

+13 −5
Original line number Original line Diff line number Diff line
@@ -1656,14 +1656,18 @@ int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, 
	req.namelen = res->lockname.len;

	req.namelen = res->lockname.len;

	memcpy(req.name, res->lockname.name, res->lockname.len);

	memcpy(req.name, res->lockname.name, res->lockname.len);





resend:

	ret = o2net_send_message(DLM_MASTER_REQUERY_MSG, dlm->key,

	ret = o2net_send_message(DLM_MASTER_REQUERY_MSG, dlm->key,

				 &req, sizeof(req), nodenum, &status);

				 &req, sizeof(req), nodenum, &status);

	/* XXX: negative status not handled properly here. */

	if (ret < 0)

	if (ret < 0)

		mlog(ML_ERROR, "Error %d when sending message %u (key "

		mlog(ML_ERROR, "Error %d when sending message %u (key "

		     "0x%x) to node %u\n", ret, DLM_MASTER_REQUERY_MSG,

		     "0x%x) to node %u\n", ret, DLM_MASTER_REQUERY_MSG,

		     dlm->key, nodenum);

		     dlm->key, nodenum);

	else {

	else if (status == -ENOMEM) {

		mlog_errno(status);

		msleep(50);

		goto resend;

	} else {

		BUG_ON(status < 0);

		BUG_ON(status < 0);

		BUG_ON(status > DLM_LOCK_RES_OWNER_UNKNOWN);

		BUG_ON(status > DLM_LOCK_RES_OWNER_UNKNOWN);

		*real_master = (u8) (status & 0xff);

		*real_master = (u8) (status & 0xff);
@@ -1705,9 +1709,13 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data, 
			int ret = dlm_dispatch_assert_master(dlm, res,

			int ret = dlm_dispatch_assert_master(dlm, res,

							     0, 0, flags);

							     0, 0, flags);

			if (ret < 0) {

			if (ret < 0) {

				mlog_errno(-ENOMEM);

				mlog_errno(ret);

				/* retry!? */

				spin_unlock(&res->spinlock);

				BUG();

				dlm_lockres_put(res);

				spin_unlock(&dlm->spinlock);

				dlm_put(dlm);

				/* sender will take care of this and retry */

				return ret;

			} else

			} else

				__dlm_lockres_grab_inflight_worker(dlm, res);

				__dlm_lockres_grab_inflight_worker(dlm, res);

			spin_unlock(&res->spinlock);

			spin_unlock(&res->spinlock);