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

Commit aec64e1b authored by David Teigland's avatar David Teigland
Browse files

dlm: another call to confirm_master in receive_request_reply 



When a failed request (EBADR or ENOTBLK) is unlocked/canceled instead of
retried, there may be other lkb's waiting on the rsb_lookup list for it
to complete.  A call to confirm_master() is needed to move on to the next
waiting lkb since the current one won't be retried.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 601342ce

fs/dlm/lock.c

+6 −2
Original line number Diff line number Diff line
@@ -1940,8 +1940,11 @@ static void confirm_master(struct dlm_rsb *r, int error) 
		break;



	case -EAGAIN:

		/* the remote master didn't queue our NOQUEUE request;

		   make a waiting lkb the first_lkid */

	case -EBADR:

	case -ENOTBLK:

		/* the remote request failed and won't be retried (it was

		   a NOQUEUE, or has been canceled/unlocked); make a waiting

		   lkb the first_lkid */



		r->res_first_lkid = 0;
@@ -3382,6 +3385,7 @@ static void receive_request_reply(struct dlm_ls *ls, struct dlm_message *ms) 
		if (is_overlap(lkb)) {

			/* we'll ignore error in cancel/unlock reply */

			queue_cast_overlap(r, lkb);

			confirm_master(r, result);

			unhold_lkb(lkb); /* undoes create_lkb() */

		} else

			_request_lock(r, lkb);