Commit 2c15bd00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: Fix dlm lock status block comment in dlm.h
  dlm: Don't send callback to node making lock request when "try 1cb" fails
parents 5fe3a5ae 269cddd4

fs/dlm/lock.c

+3 −0
Original line number Diff line number Diff line
@@ -1846,6 +1846,9 @@ static void send_bast_queue(struct dlm_rsb *r, struct list_head *head, 
	struct dlm_lkb *gr;



	list_for_each_entry(gr, head, lkb_statequeue) {

		/* skip self when sending basts to convertqueue */

		if (gr == lkb)

			continue;

		if (gr->lkb_bastfn && modes_require_bast(gr, lkb)) {

			queue_bast(r, gr, lkb->lkb_rqmode);

			gr->lkb_highbast = lkb->lkb_rqmode;

include/linux/dlm.h

+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ typedef void dlm_lockspace_t; 
 *

 * 0 if lock request was successful

 * -EAGAIN if request would block and is flagged DLM_LKF_NOQUEUE

 * -ENOMEM if there is no memory to process request

 * -EINVAL if there are invalid parameters

 * -DLM_EUNLOCK if unlock request was successful

 * -DLM_ECANCEL if a cancel completed successfully

 * -EDEADLK if a deadlock was detected

 * -ETIMEDOUT if the lock request was canceled due to a timeout

 */



#define DLM_SBF_DEMOTED		0x01