diff options
| author | Jason Gunthorpe | 2019-07-02 19:34:43 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2019-07-02 19:34:43 +0200 |
| commit | 9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb (patch) | |
| tree | 3ff6a17a33913268a2ed06e7d9a1a95e29eeee97 /include/linux/skmsg.h | |
| parent | mm/swap: fix release_pages() when releasing devmap pages (diff) | |
| parent | Linux 5.2-rc7 (diff) | |
| download | kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.tar.gz kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.tar.xz kernel-qcow2-linux-9ec3f4cb35bc8278f0582fed9f9229c9315c2ffb.zip | |
Merge tag 'v5.2-rc7' into rdma.git hmm
Required for dependencies in the next patches.
Diffstat (limited to 'include/linux/skmsg.h')
| -rw-r--r-- | include/linux/skmsg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 178a3933a71b..50ced8aba9db 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -351,6 +351,8 @@ static inline void sk_psock_update_proto(struct sock *sk, static inline void sk_psock_restore_proto(struct sock *sk, struct sk_psock *psock) { + sk->sk_write_space = psock->saved_write_space; + if (psock->sk_proto) { sk->sk_prot = psock->sk_proto; psock->sk_proto = NULL; |