diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:29:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:29:55 -0800 |
| commit | 7c70f3a7488d2fa62d32849d138bf2b8420fe788 (patch) | |
| tree | 2680c1fdf75458f9fff9c36e38612b167803f50f /include/linux/sunrpc | |
| parent | 20bf195e9391195925dac4a50e4c2c8165c1b9c5 (diff) | |
| parent | 4d12b727538609d7936fc509c032e0a52683367f (diff) | |
| download | linux-7c70f3a7488d2fa62d32849d138bf2b8420fe788.tar.gz linux-7c70f3a7488d2fa62d32849d138bf2b8420fe788.tar.bz2 linux-7c70f3a7488d2fa62d32849d138bf2b8420fe788.zip | |
Merge tag 'nfsd-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull more nfsd updates from Chuck Lever:
"Here are a few additional NFSD commits for the merge window:
Optimization:
- Cork the socket while there are queued replies
Fixes:
- DRC shutdown ordering
- svc_rdma_accept() lockdep splat"
* tag 'nfsd-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
SUNRPC: Further clean up svc_tcp_sendmsg()
SUNRPC: Remove redundant socket flags from svc_tcp_sendmsg()
SUNRPC: Use TCP_CORK to optimise send performance on the server
svcrdma: Hold private mutex while invoking rdma_accept()
nfsd: register pernet ops last, unregister first
Diffstat (limited to 'include/linux/sunrpc')
| -rw-r--r-- | include/linux/sunrpc/svcsock.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h index b7ac7fe68306..bcc555c7ae9c 100644 --- a/include/linux/sunrpc/svcsock.h +++ b/include/linux/sunrpc/svcsock.h @@ -35,6 +35,8 @@ struct svc_sock { /* Total length of the data (not including fragment headers) * received so far in the fragments making up this rpc: */ u32 sk_datalen; + /* Number of queued send requests */ + atomic_t sk_sendqlen; struct page * sk_pages[RPCSVC_MAXPAGES]; /* received data */ }; |