Commit c70422f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "Another RDMA update from Chuck Lever, and a bunch of miscellaneous
  bugfixes"

* tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux: (26 commits)
  nfsd: Fix up the "supattr_exclcreat" attributes
  nfsd: encoders mustn't use unitialized values in error cases
  nfsd: fix undefined behavior in nfsd4_layout_verify
  lockd: fix lockd shutdown race
  NFSv4: Fix callback server shutdown
  SUNRPC: Refactor svc_set_num_threads()
  NFSv4.x/callback: Create the callback service through svc_create_pooled
  lockd: remove redundant check on block
  svcrdma: Clean out old XDR encoders
  svcrdma: Remove the req_map cache
  svcrdma: Remove unused RDMA Write completion handler
  svcrdma: Reduce size of sge array in struct svc_rdma_op_ctxt
  svcrdma: Clean up RPC-over-RDMA backchannel reply processing
  svcrdma: Report Write/Reply chunk overruns
  svcrdma: Clean up RDMA_ERROR path
  svcrdma: Use rdma_rw API in RPC reply path
  svcrdma: Introduce local rdma_rw API helpers
  svcrdma: Clean up svc_rdma_get_inv_rkey()
  svcrdma: Add helper to save pages under I/O
  svcrdma: Eliminate RPCRDMA_SQ_DEPTH_MULT
  ...
parents 73ccb023 b26b78cb

fs/lockd/svc.c

+4 −2
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ lockd(void *vrqstp) 
{

	int		err = 0;

	struct svc_rqst *rqstp = vrqstp;

	struct net *net = &init_net;

	struct lockd_net *ln = net_generic(net, lockd_net_id);



	/* try_to_freeze() is called from svc_recv() */

	set_freezable();
@@ -176,6 +178,8 @@ lockd(void *vrqstp) 
	if (nlmsvc_ops)

		nlmsvc_invalidate_all();

	nlm_shutdown_hosts();

	cancel_delayed_work_sync(&ln->grace_period_end);

	locks_end_grace(&ln->lockd_manager);

	return 0;

}
@@ -270,8 +274,6 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net) 
	if (ln->nlmsvc_users) {

		if (--ln->nlmsvc_users == 0) {

			nlm_shutdown_hosts_net(net);

			cancel_delayed_work_sync(&ln->grace_period_end);

			locks_end_grace(&ln->lockd_manager);

			svc_shutdown_net(serv, net);

			dprintk("lockd_down_net: per-net data destroyed; net=%p\n", net);

		}

fs/lockd/svclock.c

+9 −9
Original line number Diff line number Diff line
@@ -870,16 +870,16 @@ nlmsvc_grant_reply(struct nlm_cookie *cookie, __be32 status) 
	if (!(block = nlmsvc_find_block(cookie)))

		return;



	if (block) {

	if (status == nlm_lck_denied_grace_period) {

		/* Try again in a couple of seconds */

		nlmsvc_insert_block(block, 10 * HZ);

	} else {

			/* Lock is now held by client, or has been rejected.

			 * In both cases, the block should be removed. */

		/*

		 * Lock is now held by client, or has been rejected.

		 * In both cases, the block should be removed.

		 */

		nlmsvc_unlink_block(block);

	}

	}

	nlmsvc_release_block(block);

}

fs/nfs/callback.c

+17 −9
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ nfs4_callback_svc(void *vrqstp) 


	set_freezable();



	while (!kthread_should_stop()) {

	while (!kthread_freezable_should_stop(NULL)) {



		if (signal_pending(current))

			flush_signals(current);

		/*

		 * Listen for a request on the socket

		 */
@@ -85,6 +88,8 @@ nfs4_callback_svc(void *vrqstp) 
			continue;

		svc_process(rqstp);

	}

	svc_exit_thread(rqstp);

	module_put_and_exit(0);

	return 0;

}
@@ -103,9 +108,10 @@ nfs41_callback_svc(void *vrqstp) 


	set_freezable();



	while (!kthread_should_stop()) {

		if (try_to_freeze())

			continue;

	while (!kthread_freezable_should_stop(NULL)) {



		if (signal_pending(current))

			flush_signals(current);



		prepare_to_wait(&serv->sv_cb_waitq, &wq, TASK_INTERRUPTIBLE);

		spin_lock_bh(&serv->sv_cb_lock);
@@ -121,11 +127,13 @@ nfs41_callback_svc(void *vrqstp) 
				error);

		} else {

			spin_unlock_bh(&serv->sv_cb_lock);

			if (!kthread_should_stop())

				schedule();

			finish_wait(&serv->sv_cb_waitq, &wq);

		}

		flush_signals(current);

	}

	svc_exit_thread(rqstp);

	module_put_and_exit(0);

	return 0;

}
@@ -221,14 +229,14 @@ err_bind: 
static struct svc_serv_ops nfs40_cb_sv_ops = {

	.svo_function		= nfs4_callback_svc,

	.svo_enqueue_xprt	= svc_xprt_do_enqueue,

	.svo_setup		= svc_set_num_threads,

	.svo_setup		= svc_set_num_threads_sync,

	.svo_module		= THIS_MODULE,

};

#if defined(CONFIG_NFS_V4_1)

static struct svc_serv_ops nfs41_cb_sv_ops = {

	.svo_function		= nfs41_callback_svc,

	.svo_enqueue_xprt	= svc_xprt_do_enqueue,

	.svo_setup		= svc_set_num_threads,

	.svo_setup		= svc_set_num_threads_sync,

	.svo_module		= THIS_MODULE,

};
@@ -280,7 +288,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion) 
		printk(KERN_WARNING "nfs_callback_create_svc: no kthread, %d users??\n",

			cb_info->users);



	serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, sv_ops);

	serv = svc_create_pooled(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, sv_ops);

	if (!serv) {

		printk(KERN_ERR "nfs_callback_create_svc: create service failed\n");

		return ERR_PTR(-ENOMEM);

fs/nfsd/nfs3xdr.c

+17 −6
Original line number Diff line number Diff line
@@ -334,8 +334,11 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, 
	if (!p)

		return 0;

	p = xdr_decode_hyper(p, &args->offset);



	args->count = ntohl(*p++);



	if (!xdr_argsize_check(rqstp, p))

		return 0;



	len = min(args->count, max_blocksize);



	/* set up the kvec */
@@ -349,7 +352,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p, 
		v++;

	}

	args->vlen = v;

	return xdr_argsize_check(rqstp, p);

	return 1;

}



int
@@ -541,9 +544,11 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p, 
	p = decode_fh(p, &args->fh);

	if (!p)

		return 0;

	if (!xdr_argsize_check(rqstp, p))

		return 0;

	args->buffer = page_address(*(rqstp->rq_next_page++));



	return xdr_argsize_check(rqstp, p);

	return 1;

}



int
@@ -569,10 +574,14 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p, 
	args->verf   = p; p += 2;

	args->dircount = ~0;

	args->count  = ntohl(*p++);



	if (!xdr_argsize_check(rqstp, p))

		return 0;



	args->count  = min_t(u32, args->count, PAGE_SIZE);

	args->buffer = page_address(*(rqstp->rq_next_page++));



	return xdr_argsize_check(rqstp, p);

	return 1;

}



int
@@ -590,6 +599,9 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, 
	args->dircount = ntohl(*p++);

	args->count    = ntohl(*p++);



	if (!xdr_argsize_check(rqstp, p))

		return 0;



	len = args->count = min(args->count, max_blocksize);

	while (len > 0) {

		struct page *p = *(rqstp->rq_next_page++);
@@ -597,8 +609,7 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p, 
			args->buffer = page_address(p);

		len -= PAGE_SIZE;

	}



	return xdr_argsize_check(rqstp, p);

	return 1;

}



int

fs/nfsd/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,8 @@ nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type) 
		return NULL;

	}



	if (!(exp->ex_layout_types & (1 << layout_type))) {

	if (layout_type >= LAYOUT_TYPE_MAX ||

	    !(exp->ex_layout_types & (1 << layout_type))) {

		dprintk("%s: layout type %d not supported\n",

			__func__, layout_type);

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE