Merge tag 'x86_seves_fixes_for_v5.10_rc1' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / include / linux / skmsg.h

diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 1e9ed84..fec0c5a 100644 (file)
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -308,6 +308,8 @@ struct sk_psock *sk_psock_init(struct sock *sk, int node);
 int sk_psock_init_strp(struct sock *sk, struct sk_psock *psock);
 void sk_psock_start_strp(struct sock *sk, struct sk_psock *psock);
 void sk_psock_stop_strp(struct sock *sk, struct sk_psock *psock);
+void sk_psock_start_verdict(struct sock *sk, struct sk_psock *psock);
+void sk_psock_stop_verdict(struct sock *sk, struct sk_psock *psock);
 
 int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock,
                         struct sk_msg *msg);
@@ -340,23 +342,6 @@ static inline void sk_psock_update_proto(struct sock *sk,
                                         struct sk_psock *psock,
                                         struct proto *ops)
 {
-       /* Initialize saved callbacks and original proto only once, since this
-        * function may be called multiple times for a psock, e.g. when
-        * psock->progs.msg_parser is updated.
-        *
-        * Since we've not installed the new proto, psock is not yet in use and
-        * we can initialize it without synchronization.
-        */
-       if (!psock->sk_proto) {
-               struct proto *orig = READ_ONCE(sk->sk_prot);
-
-               psock->saved_unhash = orig->unhash;
-               psock->saved_close = orig->close;
-               psock->saved_write_space = sk->sk_write_space;
-
-               psock->sk_proto = orig;
-       }
-
        /* Pairs with lockless read in sk_clone_lock() */
        WRITE_ONCE(sk->sk_prot, ops);
 }