Commit c85b03ab authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge Trond's nfs-for-next 

Merging Trond's nfs-for-next branch, mainly to get
b7993ceb "SUNRPC: Allow rpc_create() to
request that TCP slots be unlimited", which a small piece of the
gss-proxy work depends on.
parents bf8d9097 fd068b20

fs/lockd/clntlock.c

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) 
			timeout);

	if (ret < 0)

		return -ERESTARTSYS;

	/* Reset the lock status after a server reboot so we resend */

	if (block->b_status == nlm_lck_denied_grace_period)

		block->b_status = nlm_lck_blocked;

	req->a_res.status = block->b_status;

	return 0;

}

fs/lockd/clntproc.c

+0 −3
Original line number Diff line number Diff line
@@ -550,9 +550,6 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl) 
		status = nlmclnt_block(block, req, NLMCLNT_POLL_TIMEOUT);

		if (status < 0)

			break;

		/* Resend the blocking lock request after a server reboot */

		if (resp->status ==  nlm_lck_denied_grace_period)

			continue;

		if (resp->status != nlm_lck_blocked)

			break;

	}

fs/nfs/blocklayout/blocklayoutdm.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ static void dev_remove(struct net *net, dev_t dev) 


	bl_pipe_msg.bl_wq = &nn->bl_wq;

	memset(msg, 0, sizeof(*msg));

	msg->data = kzalloc(1 + sizeof(bl_umount_request), GFP_NOFS);

	msg->len = sizeof(bl_msg) + bl_msg.totallen;

	msg->data = kzalloc(msg->len, GFP_NOFS);

	if (!msg->data)

		goto out;
@@ -66,7 +67,6 @@ static void dev_remove(struct net *net, dev_t dev) 
	memcpy(msg->data, &bl_msg, sizeof(bl_msg));

	dataptr = (uint8_t *) msg->data;

	memcpy(&dataptr[sizeof(bl_msg)], &bl_umount_request, sizeof(bl_umount_request));

	msg->len = sizeof(bl_msg) + bl_msg.totallen;



	add_wait_queue(&nn->bl_wq, &wq);

	if (rpc_queue_upcall(nn->bl_device_pipe, msg) < 0) {

fs/nfs/callback.c

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ nfs41_callback_svc(void *vrqstp) 
	set_freezable();



	while (!kthread_should_stop()) {

		if (try_to_freeze())

			continue;



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

		spin_lock_bh(&serv->sv_cb_lock);

		if (!list_empty(&serv->sv_cb_list)) {

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ __be32 nfs4_callback_recallany(struct cb_recallanyargs *args, void *dummy, 
		     &args->craa_type_mask))

		pnfs_recall_all_layouts(cps->clp);

	if (flags)

		nfs_expire_all_delegation_types(cps->clp, flags);

		nfs_expire_unused_delegation_types(cps->clp, flags);

out:

	dprintk("%s: exit with status = %d\n", __func__, ntohl(status));

	return status;