diff options
| author | Alexander Aring <aahringo@redhat.com> | 2022-06-22 14:45:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-30 16:31:51 +0200 |
| commit | 4c3435d45abd823a4cb454fd623d5a34d52badd6 (patch) | |
| tree | 86ef59bb9259a9b99d2736cdacf5efab02c0d577 | |
| parent | ee26abc216e2881c589a8729f78bbbed5c7d0f17 (diff) | |
| download | linux-stable-4c3435d45abd823a4cb454fd623d5a34d52badd6.tar.gz linux-stable-4c3435d45abd823a4cb454fd623d5a34d52badd6.tar.bz2 linux-stable-4c3435d45abd823a4cb454fd623d5a34d52badd6.zip | |
fs: dlm: change plock interrupted message to debug again
[ Upstream commit ea06d4cabf529eefbe7e89e3a8325f1f89355ccd ]
This patch reverses the commit bcfad4265ced ("dlm: improve plock logging
if interrupted") by moving it to debug level and notifying the user an op
was removed.
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>
| -rw-r--r-- | fs/dlm/plock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 254d20eb6f4f..7c9e873a01b7 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -167,7 +167,7 @@ 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 pid %d, op removed", + log_debug(ls, "%s: wait interrupted %x %llx pid %d", __func__, ls->ls_global_id, (unsigned long long)number, op->info.pid); dlm_release_plock_op(op); @@ -473,7 +473,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count, else wake_up(&recv_wq); } else - log_print("%s: no op %x %llx - may got interrupted?", __func__, + log_print("%s: no op %x %llx", __func__, info.fsid, (unsigned long long)info.number); return count; } |