Commit 59e45c75 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: interrupt posix locks only when process is killed 



If a posix lock request is waiting for a result from user space
(dlm_controld), do not let it be interrupted unless the process
is killed. This reverts commit a6b1533e ("dlm: make posix locks
interruptible"). The problem with the interruptible change is
that all locks were cleared on any signal interrupt. If a signal
was received that did not terminate the process, the process
could continue running after all its dlm posix locks had been
cleared. A future patch will add cancelation to allow proper
interruption.

Cc: stable@vger.kernel.org
Fixes: a6b1533e ("dlm: make posix locks interruptible")
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent c847f4e2

fs/dlm/plock.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, 


	send_op(op);



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

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

	if (rv == -ERESTARTSYS) {

		spin_lock(&ops_lock);

		/* recheck under ops_lock if we got a done != 0,