Commit 89ff7783 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:

 - Stable fix to prevent an rpc_task wakeup race
 - Fix a NFSv4.1 session drain deadlock
 - Fix a NFSv4/v4.1 mount regression when not running rpc.gssd
 - Ensure auth_gss pipe detection works in namespaces
 - Fix SETCLIENTID fallback if rpcsec_gss is not available

* tag 'nfs-for-3.10-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS: Fix SETCLIENTID fallback if GSS is not available
  SUNRPC: Prevent an rpc_task wakeup race
  NFSv4.1 Fix a pNFS session draining deadlock
  SUNRPC: Convert auth_gss pipe detection to work in namespaces
  SUNRPC: Faster detection if gssd is actually running
  SUNRPC: Fix a bug in gss_create_upcall
parents 932ff06b 83c168bf

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 


	spin_lock(&tbl->slot_tbl_lock);

	/* state manager is resetting the session */

	if (test_bit(NFS4_SESSION_DRAINING, &clp->cl_session->session_state)) {

	if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state)) {

		spin_unlock(&tbl->slot_tbl_lock);

		status = htonl(NFS4ERR_DELAY);

		/* Return NFS4ERR_BADSESSION if we're draining the session

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ static void nfs4_callback_free_slot(struct nfs4_session *session) 
	 * A single slot, so highest used slotid is either 0 or -1

	 */

	tbl->highest_used_slotid = NFS4_NO_SLOT;

	nfs4_session_drain_complete(session, tbl);

	nfs4_slot_tbl_drain_complete(tbl);

	spin_unlock(&tbl->slot_tbl_lock);

}

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, 
	__set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);

	error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);

	if (error == -EINVAL)

		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_NULL);

		error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);

	if (error < 0)

		goto error;

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ int nfs41_setup_sequence(struct nfs4_session *session, 
	task->tk_timeout = 0;



	spin_lock(&tbl->slot_tbl_lock);

	if (test_bit(NFS4_SESSION_DRAINING, &session->session_state) &&

	if (test_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state) &&

	    !args->sa_privileged) {

		/* The state manager will wait until the slot table is empty */

		dprintk("%s session is draining\n", __func__);

fs/nfs/nfs4session.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot) 
			tbl->highest_used_slotid = new_max;

		else {

			tbl->highest_used_slotid = NFS4_NO_SLOT;

			nfs4_session_drain_complete(tbl->session, tbl);

			nfs4_slot_tbl_drain_complete(tbl);

		}

	}

	dprintk("%s: slotid %u highest_used_slotid %d\n", __func__,
@@ -226,7 +226,7 @@ static bool nfs41_assign_slot(struct rpc_task *task, void *pslot) 
	struct nfs4_slot *slot = pslot;

	struct nfs4_slot_table *tbl = slot->table;



	if (nfs4_session_draining(tbl->session) && !args->sa_privileged)

	if (nfs4_slot_tbl_draining(tbl) && !args->sa_privileged)

		return false;

	slot->generation = tbl->generation;

	args->sa_slot = slot;

CRA Git | Maintained and supported by SUSTech CRA and CCSE