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

Commit d000f8d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm update from David Teigland:
 "This includes one simple fix to make posix locks interruptible by
  signals in cases where a signal handler is used"

* tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: make posix locks interruptible
parents 9576c2f2 a6b1533e

fs/dlm/plock.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
	send_op(op);



	if (xop->callback == NULL) {

		rv = wait_event_killable(recv_wq, (op->done != 0));

		rv = wait_event_interruptible(recv_wq, (op->done != 0));

		if (rv == -ERESTARTSYS) {

			log_debug(ls, "dlm_posix_lock: wait killed %llx",

				  (unsigned long long)number);