tree b7a7afdb59c0421f371c7242c170982153a76835
parent 72211dbe727f7c1451aa5adfcbd1197b090eb276
author Trond Myklebust <Trond.Myklebust@netapp.com> 1260916617 -0500
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1260916617 -0500

NFSv4: Fix a regression in the NFSv4 state manager

Commit 5601a00d671fe89f9b087513244abcd08ad67e7d (nfs: run state manager
in privileged mode) introduces a regression in the NFSv4 code when
compiled with CONFIG_NFS_V4_1. The calls to nfs4_end_drain_session()
from the main loop in nfs4_state_manager() Oops due to the lack of an
NFSv4.1 session when running NFSv4.0.

The fix is to move those two calls back into nfs41_init_clientid() and
nfs4_reset_session().

The calls to nfs4_end_drain_session() that remain inside
nfs4_state_manager() are safe, since the NFSv4.0 code will never set the
NFS4CLNT_SESSION_DRAINING bit.

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