Commit 8728f986 authored Apr 30, 2013 by Linus Torvalds

linux-nfs

Pull NFS client bugfixes and cleanups from Trond Myklebust:

 - NLM: stable fix for NFSv2/v3 blocking locks

 - NFSv4.x: stable fixes for the delegation recall error handling code

 - NFSv4.x: Security flavour negotiation fixes and cleanups by Chuck
   Lever

 - SUNRPC: A number of RPCSEC_GSS fixes and cleanups also from Chuck

 - NFSv4.x assorted state management and reboot recovery bugfixes

 - NFSv4.1: In cases where we have already looked up a file, and hold a
   valid filehandle, use the new open-by-filehandle operation instead of
   opening by name.

 - Allow the NFSv4.1 callback thread to freeze

 - NFSv4.x: ensure that file unlock waits for readahead to complete

 - NFSv4.1: ensure that the RPC layer doesn't override the NFS session
   table size negotiation by limiting the number of slots.

 - NFSv4.x: Fix SETATTR spec compatibility issues

* tag 'nfs-for-3.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (67 commits)
  NFSv4: Warn once about servers that incorrectly apply open mode to setattr
  NFSv4: Servers should only check SETATTR stateid open mode on size change
  NFSv4: Don't recheck permissions on open in case of recovery cached open
  NFSv4.1: Don't do a delegated open for NFS4_OPEN_CLAIM_DELEG_CUR_FH modes
  NFSv4.1: Use the more efficient open_noattr call for open-by-filehandle
  NFS: Retry SETCLIENTID with AUTH_SYS instead of AUTH_NONE
  NFSv4: Ensure that we clear the NFS_OPEN_STATE flag when appropriate
  LOCKD: Ensure that nlmclnt_block resets block->b_status after a server reboot
  NFSv4: Ensure the LOCK call cannot use the delegation stateid
  NFSv4: Use the open stateid if the delegation has the wrong mode
  nfs: Send atime and mtime as a 64bit value
  NFSv4: Record the OPEN create mode used in the nfs4_opendata structure
  NFSv4.1: Set the RPC_CLNT_CREATE_INFINITE_SLOTS flag for NFSv4.1 transports
  SUNRPC: Allow rpc_create() to request that TCP slots be unlimited
  SUNRPC: Fix a livelock problem in the xprt->backlog queue
  NFSv4: Fix handling of revoked delegations by setattr
  NFSv4 release the sequence id in the return on close case
  nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks
  NFS: Ensure that NFS file unlock waits for readahead to complete
  NFS: Add functionality to allow waiting on all outstanding reads to complete
  ...

parents e72859b8 721ccfb7

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 @@ again:
		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/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;

fs/nfs/client.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -593,6 +593,8 @@ int nfs_create_rpc_client(struct nfs_client *clp,
		args.flags \|= RPC_CLNT_CREATE_DISCRTRY;
		if (test_bit(NFS_CS_NORESVPORT, &clp->cl_flags))
		args.flags \|= RPC_CLNT_CREATE_NONPRIVPORT;
		if (test_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags))
		args.flags \|= RPC_CLNT_CREATE_INFINITE_SLOTS;

		if (!IS_ERR(clp->cl_rpcclient))
		return 0;

Admin message