From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 00:58:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'dlm/next'
X-Git-Tag: KARO-TXUL-2015-12-04~100
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=5c46ad47e9be97f788f12f4ebef961c54bb2f06a;hp=d7f40cc754bf479cca4a0f607b173efd4e6c805a

Merge remote-tracking branch 'dlm/next'
---

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 3585cc056fd1..d401425f602a 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -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);