Commit 1b66c114 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fixes from Chuck Lever:

 - A collection of minor bug fixes

* tag 'nfsd-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: Remove open coding of string copy
  SUNRPC: Fix trace_svc_register() call site
  SUNRPC: always free ctxt when freeing deferred request
  SUNRPC: double free xprt_ctxt while still in use
  SUNRPC: Fix error handling in svc_setup_socket()
  SUNRPC: Fix encoding of accepted but unsuccessful RPC replies
  lockd: define nlm_port_min,max with CONFIG_SYSCTL
  nfsd: define exports_proc_ops with CONFIG_PROC_FS
  SUNRPC: Avoid relying on crypto API to derive CBC-CTS output IV
parents cba58263 21a3f332

fs/lockd/svc.c

+1 −1
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ static const unsigned long nlm_grace_period_min = 0; 
static const unsigned long	nlm_grace_period_max = 240;

static const unsigned long	nlm_timeout_min = 3;

static const unsigned long	nlm_timeout_max = 20;

static const int		nlm_port_min = 0, nlm_port_max = 65535;



#ifdef CONFIG_SYSCTL

static const int		nlm_port_min = 0, nlm_port_max = 65535;

static struct ctl_table_header * nlm_sysctl_table;

#endif

fs/nfsd/nfsctl.c

+13 −12
Original line number Diff line number Diff line
@@ -153,18 +153,6 @@ static int exports_net_open(struct net *net, struct file *file) 
	return 0;

}



static int exports_proc_open(struct inode *inode, struct file *file)

{

	return exports_net_open(current->nsproxy->net_ns, file);

}



static const struct proc_ops exports_proc_ops = {

	.proc_open	= exports_proc_open,

	.proc_read	= seq_read,

	.proc_lseek	= seq_lseek,

	.proc_release	= seq_release,

};



static int exports_nfsd_open(struct inode *inode, struct file *file)

{

	return exports_net_open(inode->i_sb->s_fs_info, file);
@@ -1458,6 +1446,19 @@ static struct file_system_type nfsd_fs_type = { 
MODULE_ALIAS_FS("nfsd");



#ifdef CONFIG_PROC_FS



static int exports_proc_open(struct inode *inode, struct file *file)

{

	return exports_net_open(current->nsproxy->net_ns, file);

}



static const struct proc_ops exports_proc_ops = {

	.proc_open	= exports_proc_open,

	.proc_read	= seq_read,

	.proc_lseek	= seq_lseek,

	.proc_release	= seq_release,

};



static int create_proc_exports_entry(void)

{

	struct proc_dir_entry *entry;

fs/nfsd/trace.h

+3 −3
Original line number Diff line number Diff line
@@ -1365,19 +1365,19 @@ TRACE_EVENT(nfsd_cb_setup, 
		__field(u32, cl_id)

		__field(unsigned long, authflavor)

		__sockaddr(addr, clp->cl_cb_conn.cb_addrlen)

		__array(unsigned char, netid, 8)

		__string(netid, netid)

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		strlcpy(__entry->netid, netid, sizeof(__entry->netid));

		__assign_str(netid, netid);

		__entry->authflavor = authflavor;

		__assign_sockaddr(addr, &clp->cl_cb_conn.cb_addr,

				  clp->cl_cb_conn.cb_addrlen)

	),

	TP_printk("addr=%pISpc client %08x:%08x proto=%s flavor=%s",

		__get_sockaddr(addr), __entry->cl_boot, __entry->cl_id,

		__entry->netid, show_nfsd_authflavor(__entry->authflavor))

		__get_str(netid), show_nfsd_authflavor(__entry->authflavor))

);



TRACE_EVENT(nfsd_cb_setup_err,

include/linux/sunrpc/svc_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ extern struct svc_rdma_recv_ctxt * 
extern void svc_rdma_recv_ctxt_put(struct svcxprt_rdma *rdma,

				   struct svc_rdma_recv_ctxt *ctxt);

extern void svc_rdma_flush_recv_queues(struct svcxprt_rdma *rdma);

extern void svc_rdma_release_rqst(struct svc_rqst *rqstp);

extern void svc_rdma_release_ctxt(struct svc_xprt *xprt, void *ctxt);

extern int svc_rdma_recvfrom(struct svc_rqst *);



/* svc_rdma_rw.c */

include/linux/sunrpc/svc_xprt.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct svc_xprt_ops { 
	int		(*xpo_sendto)(struct svc_rqst *);

	int		(*xpo_result_payload)(struct svc_rqst *, unsigned int,

					      unsigned int);

	void		(*xpo_release_rqst)(struct svc_rqst *);

	void		(*xpo_release_ctxt)(struct svc_xprt *xprt, void *ctxt);

	void		(*xpo_detach)(struct svc_xprt *);

	void		(*xpo_free)(struct svc_xprt *);

	void		(*xpo_kill_temp_xprt)(struct svc_xprt *);