iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dlm: make posix locks interruptible

Browse Source 
Replace wait_event_killable with wait_event_interruptible
so that a program waiting for a posix lock can be
interrupted by a signal.  With the killable version,
a program was not interruptible by a signal if it
had a signal handler set for it, overriding the default
action of terminating the process.

Signed-off-by: Eric Ren <zren@suse.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Eric Ren 2015-10-14 23:28:26 +08:00 committed by David Teigland
parent 7379047d55
commit a6b1533e9a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/dlm/plock.c
View File

@ -145,7 +145,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
send_op(op); send_op(op);
if (xop->callback == NULL) { 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) { if (rv == -ERESTARTSYS) {
log_debug(ls, "dlm_posix_lock: wait killed %llx", log_debug(ls, "dlm_posix_lock: wait killed %llx",
(unsigned long long)number); (unsigned long long)number);