dlm: improve plock logging if interrupted

[ Upstream commit bcfad4265cedf3adcac355e994ef9771b78407bd ]

This patch changes the log level if a plock is removed when interrupted
from debug to info. Additional it signals now that the plock entity was
removed to let the user know what's happening.

If on a dev_write() a pending plock cannot be find it will signal that
it might have been removed because wait interruption.

Before this patch there might be a "dev_write no op ..." info message
and the users can only guess that the plock was removed before because
the wait interruption. To be sure that is the case we log both messages
on the same log level.

Let both message be logged on info layer because it should not happened
a lot and if it happens it should be clear why the op was not found.

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>

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index f3482e936cc2500f27d7d74c4b1c83db80eb403a..f74d5a28ad27c0924b71268804a870116569ee93 100644 (file)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -161,11 +161,12 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
 
        rv = wait_event_killable(recv_wq, (op->done != 0));
        if (rv == -ERESTARTSYS) {
-               log_debug(ls, "%s: wait killed %llx", __func__,
-                         (unsigned long long)number);
                spin_lock(&ops_lock);
                list_del(&op->list);
                spin_unlock(&ops_lock);
+               log_print("%s: wait interrupted %x %llx, op removed",
+                         __func__, ls->ls_global_id,
+                         (unsigned long long)number);
                dlm_release_plock_op(op);
                do_unlock_close(ls, number, file, fl);
                goto out;
@@ -469,8 +470,8 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
                else
                        wake_up(&recv_wq);
        } else
-               log_print("dev_write no op %x %llx", info.fsid,
-                         (unsigned long long)info.number);
+               log_print("%s: no op %x %llx - may got interrupted?", __func__,
+                         info.fsid, (unsigned long long)info.number);
        return count;
 }