diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-06-16 09:52:27 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-06-22 13:24:03 -0400 |
| commit | fe74ba3a8db003410e48863a5cafa6ac90674540 (patch) | |
| tree | 8a3014b14a3c48d997ac08a378128e8b4202b00d /fs | |
| parent | d77d76ffb638bd013782138cca6d8f4918c5afd6 (diff) | |
| download | linux-fe74ba3a8db003410e48863a5cafa6ac90674540.tar.gz linux-fe74ba3a8db003410e48863a5cafa6ac90674540.tar.bz2 linux-fe74ba3a8db003410e48863a5cafa6ac90674540.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/client.c | 7 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 1df708fd4205..4e7df2adb212 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1157,6 +1157,13 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp) return -ENOMEM; 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 */ diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5d87563d0c1a..b4132fe14282 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4795,13 +4795,6 @@ struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp) if (!session) 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); tbl = &session->fc_slot_table; |