Patch "fs: dlm: interrupt posix locks only when process is killed" has been added to the 6.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

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

to the 6.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     fs-dlm-interrupt-posix-locks-only-when-process-is-killed.patch
and it can be found in the queue-6.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 59e45c758ca1b9893ac923dd63536da946ac333b Mon Sep 17 00:00:00 2001
From: Alexander Aring <aahringo@xxxxxxxxxx>
Date: Fri, 19 May 2023 11:21:26 -0400
Subject: fs: dlm: interrupt posix locks only when process is killed

From: Alexander Aring <aahringo@xxxxxxxxxx>

commit 59e45c758ca1b9893ac923dd63536da946ac333b upstream.

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@xxxxxxxxxxxxxxx
Fixes: a6b1533e9a57 ("dlm: make posix locks interruptible")
Signed-off-by: Alexander Aring <aahringo@xxxxxxxxxx>
Signed-off-by: David Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 fs/dlm/plock.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -155,7 +155,7 @@ int dlm_posix_lock(dlm_lockspace_t *lock
 
 	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,


Patches currently in stable-queue which might be from aahringo@xxxxxxxxxx are

queue-6.4/fs-dlm-return-positive-pid-value-for-f_getlk.patch
queue-6.4/fs-dlm-fix-cleanup-pending-ops-when-interrupted.patch
queue-6.4/fs-dlm-make-f_setlk-use-unkillable-wait_event.patch
queue-6.4/fs-dlm-revert-check-required-context-while-close.patch
queue-6.4/fs-dlm-fix-missing-pending-to-false.patch
queue-6.4/fs-dlm-fix-mismatch-of-plock-results-from-userspace.patch
queue-6.4/fs-dlm-clear-pending-bit-when-queue-was-empty.patch
queue-6.4/fs-dlm-interrupt-posix-locks-only-when-process-is-killed.patch



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux