Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe74ba3a authored Jun 16, 2010 by Trond Myklebust

NFSv41: Cleanup for nfs4_alloc_session.

There is no reason to change the nfs_client state every time we allocate a
new session. Move that line into nfs4_init_client_minor_version.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent d77d76ff

fs/nfs/client.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1157,6 +1157,13 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp)
	return -ENOMEM;		return -ENOMEM;

	clp->cl_session = session;		clp->cl_session = session;
			/*
			* The create session reply races with the server back
			* channel probe. Mark the client NFS_CS_SESSION_INITING
			* so that the client back channel can find the
			* nfs_client struct
			*/
			clp->cl_cons_state = NFS_CS_SESSION_INITING;
	}		}
	#endif /* CONFIG_NFS_V4_1 */		#endif /* CONFIG_NFS_V4_1 */

fs/nfs/nfs4proc.c

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4795,13 +4795,6 @@ struct nfs4_session nfs4_alloc_session(struct nfs_client clp)
	if (!session)		if (!session)
	return NULL;		return NULL;

	/*
	* The create session reply races with the server back
	* channel probe. Mark the client NFS_CS_SESSION_INITING
	* so that the client back channel can find the
	* nfs_client struct
	*/
	clp->cl_cons_state = NFS_CS_SESSION_INITING;
	init_completion(&session->complete);		init_completion(&session->complete);

	tbl = &session->fc_slot_table;		tbl = &session->fc_slot_table;