This is a note to let you know that I've just added the patch titled
fs: dlm: return positive pid value for F_GETLK
to the 6.1-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-return-positive-pid-value-for-f_getlk.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 92655fbda5c05950a411eaabc19e025e86e2a291 Mon Sep 17 00:00:00 2001
From: Alexander Aring <aahringo@xxxxxxxxxx>
Date: Fri, 19 May 2023 11:21:24 -0400
Subject: fs: dlm: return positive pid value for F_GETLK
From: Alexander Aring <aahringo@xxxxxxxxxx>
commit 92655fbda5c05950a411eaabc19e025e86e2a291 upstream.
The GETLK pid values have all been negated since commit 9d5b86ac13c5
("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks").
Revert this for local pids, and leave in place negative pids for remote
owners.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: 9d5b86ac13c5 ("fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks")
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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -359,7 +359,9 @@ int dlm_posix_get(dlm_lockspace_t *locks
locks_init_lock(fl);
fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK;
fl->fl_flags = FL_POSIX;
- fl->fl_pid = -op->info.pid;
+ fl->fl_pid = op->info.pid;
+ if (op->info.nodeid != dlm_our_nodeid())
+ fl->fl_pid = -fl->fl_pid;
fl->fl_start = op->info.start;
fl->fl_end = op->info.end;
rv = 0;
Patches currently in stable-queue which might be from aahringo@xxxxxxxxxx are
queue-6.1/fs-dlm-return-positive-pid-value-for-f_getlk.patch
queue-6.1/fs-dlm-fix-cleanup-pending-ops-when-interrupted.patch
queue-6.1/fs-dlm-make-f_setlk-use-unkillable-wait_event.patch
queue-6.1/fs-dlm-revert-check-required-context-while-close.patch
queue-6.1/fs-dlm-fix-mismatch-of-plock-results-from-userspace.patch
queue-6.1/fs-dlm-interrupt-posix-locks-only-when-process-is-killed.patch
