Commit 9e4bc4bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0a2e2305 24457f1b

fs/nfs/inode.c

+6 −1
Original line number Diff line number Diff line
@@ -2429,7 +2429,12 @@ static int nfs_net_init(struct net *net) 
	struct nfs_net *nn = net_generic(net, nfs_net_id);



	nfs_clients_init(net);

	rpc_proc_register(net, &nn->rpcstats);



	if (!rpc_proc_register(net, &nn->rpcstats)) {

		nfs_clients_exit(net);

		return -ENOMEM;

	}



	return nfs_fs_proc_net_init(net);

}

net/sunrpc/xprtsock.c

+1 −0
Original line number Diff line number Diff line
@@ -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;