projects/linux·commit d000f8d6

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

d000f8d6 · Linus Torvalds <[email protected]> · 2015-11-05 11:15:25 -08:00

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
Commit
d000f8d67f2bb464c9cf4fb5103f78d8cb406c05
Parents
9576c2f2 · a6b1533e

Merge commit. Changes below are compared with the first parent: 9576c2f2.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
fs/dlm/plock.cmodified+1−1View file

fs/dlm/plock.c

View file
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 3585cc0..d401425 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);