diff options
| author | Alexander Aring <aahringo@redhat.com> | 2023-05-19 11:21:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-11 11:45:29 +0200 |
| commit | 6f21b584feaf0bde423a25d5d4a0996cb1c1b635 (patch) | |
| tree | f352a081cd8c7048cc53d7bfe891684170dfa709 /fs/dlm | |
| parent | 66cf508de1d746efa51b12c911d416c5f430976d (diff) | |
| download | linux-stable-6f21b584feaf0bde423a25d5d4a0996cb1c1b635.tar.gz linux-stable-6f21b584feaf0bde423a25d5d4a0996cb1c1b635.tar.bz2 linux-stable-6f21b584feaf0bde423a25d5d4a0996cb1c1b635.zip | |
fs: dlm: interrupt posix locks only when process is killed
[ Upstream commit 59e45c758ca1b9893ac923dd63536da946ac333b ]
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 a6b1533e9a57 ("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: a6b1533e9a57 ("dlm: make posix locks interruptible")
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
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 54ed11013d06..9fef426ce6f4 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -162,7 +162,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) { log_debug(ls, "%s: wait killed %llx", __func__, (unsigned long long)number); |