xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs: dlm: change plock interrupted message to debug again

Browse Source 
[ 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>
This commit is contained in:
Alexander Aring
2022-06-22 14:45:05 -04:00
committed by Greg Kroah-Hartman
parent 1652bcbf9e
commit d503919895
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/dlm/plock.c
View File

@@ -164,7 +164,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
spin_lock(&ops_lock); spin_lock(&ops_lock);
list_del(&op->list); list_del(&op->list);
spin_unlock(&ops_lock); 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, __func__, ls->ls_global_id,
(unsigned long long)number, op->info.pid); (unsigned long long)number, op->info.pid);
dlm_release_plock_op(op); dlm_release_plock_op(op);
@@ -470,7 +470,7 @@ static ssize_t dev_write(struct file *file, const char __user *u, size_t count,
else else
wake_up(&recv_wq); wake_up(&recv_wq);
} else } 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); info.fsid, (unsigned long long)info.number);
return count; return count;
} }