]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs: dlm: add pid to debug log
authorAlexander Aring <aahringo@redhat.com>
Wed, 22 Jun 2022 18:45:06 +0000 (14:45 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Aug 2023 14:23:09 +0000 (16:23 +0200)
[ Upstream commit 19d7ca051d303622c423b4cb39e6bde5d177328b ]

This patch adds the pid information which requested the lock operation
to the debug log output.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Stable-dep-of: 57e2c2f2d94c ("fs: dlm: fix mismatch of plock results from userspace")
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/dlm/plock.c

index 95f4662c1209a1a9450265ebb611cc6d30d5b4fd..f685d56a4f909aa64d5db1ab40d63fee75bd5db5 100644 (file)
@@ -164,9 +164,9 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
                spin_lock(&ops_lock);
                list_del(&op->list);
                spin_unlock(&ops_lock);
-               log_print("%s: wait interrupted %x %llx, op removed",
+               log_print("%s: wait interrupted %x %llx pid %d, op removed",
                          __func__, ls->ls_global_id,
-                         (unsigned long long)number);
+                         (unsigned long long)number, op->info.pid);
                dlm_release_plock_op(op);
                do_unlock_close(ls, number, file, fl);
                goto out;