korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fs: dlm: fix building without lockdep

Browse Source 
This patch uses assert_spin_locked() instead of lockdep_is_held()
where it's available to use because lockdep_is_held() is only available
if CONFIG_LOCKDEP is set.

In other cases like lockdep_sock_is_held() we surround it by a
CONFIG_LOCKDEP idef.

Fixes: dbb751ffab ("fs: dlm: parallelize lowcomms socket handling")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
Alexander Aring 2022-11-22 09:48:01 -05:00 committed by David Teigland
parent dbb751ffab
commit 7a5e9f1f83
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/dlm/lowcomms.c
View File

@ -208,7 +208,7 @@ bool dlm_lowcomms_is_running(void)
static void lowcomms_queue_swork(struct connection *con)
{
WARN_ON_ONCE(!lockdep_is_held(&con->writequeue_lock));
assert_spin_locked(&con->writequeue_lock);
if (!test_bit(CF_IO_STOP, &con->flags) &&
!test_bit(CF_APP_LIMITED, &con->flags) &&
@ -218,7 +218,9 @@ static void lowcomms_queue_swork(struct connection *con)
static void lowcomms_queue_rwork(struct connection *con)
{
#ifdef CONFIG_LOCKDEP
WARN_ON_ONCE(!lockdep_sock_is_held(con->sock->sk));
#endif
if (!test_bit(CF_IO_STOP, &con->flags) &&
!test_and_set_bit(CF_RECV_PENDING, &con->flags))
@ -618,7 +620,9 @@ static void lowcomms_error_report(struct sock *sk)
static void restore_callbacks(struct sock *sk)
{
#ifdef CONFIG_LOCKDEP
WARN_ON_ONCE(!lockdep_sock_is_held(sk));
#endif
sk->sk_user_data = NULL;
sk->sk_data_ready = listen_sock.sk_data_ready;