diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2024-04-29 12:07:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2024-04-29 12:07:37 -0700 |
| commit | 9e4bc4bcae012c98964c3c2010debfbd9e5b229f (patch) | |
| tree | f38ac6f09ea64a56866cf3b62f47269082343ff4 /net | |
| parent | Merge tag 'bcachefs-2024-04-29' of https://evilpiepirate.org/git/bcachefs (diff) | |
| parent | nfs: Handle error of rpc_proc_register() in nfs_net_init(). (diff) | |
| download | linux-9e4bc4bcae012c98964c3c2010debfbd9e5b229f.tar.gz linux-9e4bc4bcae012c98964c3c2010debfbd9e5b229f.tar.bz2 linux-9e4bc4bcae012c98964c3c2010debfbd9e5b229f.zip | |
Merge tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client fixes from Trond Myklebust:
- Fix an Oops in xs_tcp_tls_setup_socket
- Fix an Oops due to missing error handling in nfs_net_init()
* tag 'nfs-for-6.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
nfs: Handle error of rpc_proc_register() in nfs_net_init().
SUNRPC: add a missing rpc_stat for TCP TLS
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index bb9b747d58a1..ce18716491c8 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2664,6 +2664,7 @@ static void xs_tcp_tls_setup_socket(struct work_struct *work) .xprtsec = { .policy = RPC_XPRTSEC_NONE, }, + .stats = upper_clnt->cl_stats, }; unsigned int pflags = current->flags; struct rpc_clnt *lower_clnt; |