diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 30fb73470ee38b..2ac04da3b04c28 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -121,7 +121,6 @@ struct sk_psock { struct mutex work_mutex; struct sk_psock_work_state work_state; struct delayed_work work; - struct mutex work_backlog_mutex; bool work_backlog_delayed; struct delayed_work work_backlog; struct sock *sk_pair; diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 6d3ab936e60fe6..45639c8525092a 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -804,9 +804,7 @@ static void sk_psock_backlog_msg_work(struct work_struct *work) struct delayed_work *dwork = to_delayed_work(work); struct sk_psock *psock = container_of(dwork, struct sk_psock, work_backlog); - mutex_lock(&psock->work_backlog_mutex); sk_psock_backlog_msg(psock); - mutex_unlock(&psock->work_backlog_mutex); } struct sk_psock *sk_psock_init(struct sock *sk, int node) @@ -847,7 +845,6 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node) INIT_DELAYED_WORK(&psock->work, sk_psock_backlog); mutex_init(&psock->work_mutex); INIT_DELAYED_WORK(&psock->work_backlog, sk_psock_backlog_msg_work); - mutex_init(&psock->work_backlog_mutex); INIT_LIST_HEAD(&psock->ingress_msg); spin_lock_init(&psock->ingress_lock); INIT_LIST_HEAD(&psock->backlog_msg); @@ -963,8 +960,6 @@ static void sk_psock_destroy(struct work_struct *work) __sk_psock_zap_ingress(psock); __sk_psock_purge_ingress_msg_backlog(psock); mutex_destroy(&psock->work_mutex); - mutex_destroy(&psock->work_backlog_mutex); - psock_progs_drop(&psock->progs); sk_psock_link_destroy(psock);