diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 11:15:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 11:15:25 -0800 |
| commit | d000f8d67f2bb464c9cf4fb5103f78d8cb406c05 (patch) | |
| tree | ee34c7a8a621389136a75f74ceddcf28104a7332 /fs/dlm | |
| parent | 9576c2f2934eb5839a468ae156418ef595d5fec6 (diff) | |
| parent | a6b1533e9a57d76cd3d9b7649d29ac604b1874b8 (diff) | |
| download | linux-d000f8d67f2bb464c9cf4fb5103f78d8cb406c05.tar.gz linux-d000f8d67f2bb464c9cf4fb5103f78d8cb406c05.tar.bz2 linux-d000f8d67f2bb464c9cf4fb5103f78d8cb406c05.zip | |
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
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/plock.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |