Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da794f6d authored by Alexander Aring's avatar Alexander Aring Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Stable-dep-of: 57e2c2f2d94c ("fs: dlm: fix mismatch of plock results from userspace")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f03726ef

fs/dlm/plock.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,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);
@@ -470,7 +470,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;

}