skmsg: Make sk_psock_destroy() static

Cong Wang · borkmann · commit 8063e184e490 · 2021-01-28T00:35:03.000+01:00
sk_psock_destroy() is a RCU callback, I can't see any reason why it could be used outside. Signed-off-by: Cong Wang <cong.wang@bytedance.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: John Fastabend <john.fastabend@gmail.com> Cc: Jakub Sitnicki <jakub@cloudflare.com> Cc: Lorenz Bauer <lmb@cloudflare.com> Link: https://lore.kernel.org/bpf/20210127221501.46866-1-xiyou.wangcong@gmail.com
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
@@ -390,7 +390,6 @@ static inline struct sk_psock *sk_psock_get(struct sock *sk)
 }
 
 void sk_psock_stop(struct sock *sk, struct sk_psock *psock);
-void sk_psock_destroy(struct rcu_head *rcu);
 void sk_psock_drop(struct sock *sk, struct sk_psock *psock);
 
 static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock)
diff --git a/net/core/skmsg.c b/net/core/skmsg.c
@@ -669,14 +669,13 @@ static void sk_psock_destroy_deferred(struct work_struct *gc)
 	kfree(psock);
 }
 
-void sk_psock_destroy(struct rcu_head *rcu)
+static void sk_psock_destroy(struct rcu_head *rcu)
 {
 	struct sk_psock *psock = container_of(rcu, struct sk_psock, rcu);
 
 	INIT_WORK(&psock->gc, sk_psock_destroy_deferred);
 	schedule_work(&psock->gc);
 }
-EXPORT_SYMBOL_GPL(sk_psock_destroy);
 
 void sk_psock_drop(struct sock *sk, struct sk_psock *psock)
 {

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,6 @@ static inline struct sk_psock sk_psock_get(struct sock sk)`
`390`	`390`	`}`
`391`	`391`
`392`	`392`	`void sk_psock_stop(struct sock sk, struct sk_psock psock);`
`393`		`-void sk_psock_destroy(struct rcu_head *rcu);`
`394`	`393`	`void sk_psock_drop(struct sock sk, struct sk_psock psock);`
`395`	`394`
`396`	`395`	`static inline void sk_psock_put(struct sock sk, struct sk_psock psock)`
Original file line number	Diff line number	Diff line change
`@@ -669,14 +669,13 @@ static void sk_psock_destroy_deferred(struct work_struct *gc)`
`669`	`669`	`kfree(psock);`
`670`	`670`	`}`
`671`	`671`
`672`		`-void sk_psock_destroy(struct rcu_head *rcu)`
	`672`	`+static void sk_psock_destroy(struct rcu_head *rcu)`
`673`	`673`	`{`
`674`	`674`	`struct sk_psock *psock = container_of(rcu, struct sk_psock, rcu);`
`675`	`675`
`676`	`676`	`INIT_WORK(&psock->gc, sk_psock_destroy_deferred);`
`677`	`677`	`schedule_work(&psock->gc);`
`678`	`678`	`}`
`679`		`-EXPORT_SYMBOL_GPL(sk_psock_destroy);`
`680`	`679`
`681`	`680`	`void sk_psock_drop(struct sock sk, struct sk_psock psock)`
`682`	`681`	`{`