mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
nfs41: sessions client infrastructure
NFSv4.1 Sessions basic data types, initialization, and destruction. The session is always associated with a struct nfs_client that holds the exchange_id results. Signed-off-by: Rahul Iyer <iyer@netapp.com> Signed-off-by: Andy Adamson<andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [remove extraneous rpc_clnt pointer, use the struct nfs_client cl_rpcclient. remove the rpc_clnt parameter from nfs4 nfs4_init_session] Signed-off-by: Andy Adamson<andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [Use the presence of a session to determine behaviour instead of the minorversion number.] Signed-off-by: Andy Adamson <andros@netapp.com> [constified nfs4_has_session's struct nfs_client parameter] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [Rename nfs4_put_session() to nfs4_destroy_session() and call it from nfs4_free_client() not nfs4_free_server(). Also get rid of nfs4_get_session() and the ref_count in nfs4_session struct as keeping track of nfs_client should be sufficient] Signed-off-by: Alexandros Batsakis <Alexandros.Batsakis@netapp.com> [nfs41: pass rsize and wsize into nfs4_init_session] Signed-off-by: Andy Adamson <andros@netapp.com> [separated out removal of rpc_clnt parameter from nfs4_init_session ot a patch of its own] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [Pass the nfs_client pointer into nfs4_alloc_session] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: don't assign to session->clp->cl_session in nfs4_destroy_session] [nfs41: fixup nfs4_clear_client_minor_version] [introduce nfs4_clear_client_minor_version() in this patch] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [Refactor nfs4_init_session] Moved session allocation into nfs4_init_client_minor_version, called from nfs4_init_client. Leave rwise and wsize initialization in nfs4_init_session, called from nfs4_init_server. Reverted moving of nfs_fsid definition to nfs_fs_sb.h Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: Move NFS4_MAX_SLOT_TABLE define from under CONFIG_NFS_V4_1] [Fix comile error when CONFIG_NFS_V4_1 is not set.] Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Benny Halevy <bhalevy@panasas.com> [moved nfs4_init_slot_table definition to "create_session operation"] Signed-off-by: Benny Halevy <bhalevy@panasas.com> [nfs41: alloc session with GFP_KERNEL] Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
9ff71c3a98
commit
557134a39c
6 changed files with 174 additions and 0 deletions
|
@ -183,6 +183,20 @@ static void nfs4_shutdown_client(struct nfs_client *clp)
|
|||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* Clears/puts all minor version specific parts from an nfs_client struct
|
||||
* reverting it to minorversion 0.
|
||||
*/
|
||||
static void nfs4_clear_client_minor_version(struct nfs_client *clp)
|
||||
{
|
||||
#ifdef CONFIG_NFS_V4_1
|
||||
if (nfs4_has_session(clp)) {
|
||||
nfs4_destroy_session(clp->cl_session);
|
||||
clp->cl_session = NULL;
|
||||
}
|
||||
#endif /* CONFIG_NFS_V4_1 */
|
||||
}
|
||||
|
||||
/*
|
||||
* Destroy a shared client record
|
||||
*/
|
||||
|
@ -190,6 +204,7 @@ static void nfs_free_client(struct nfs_client *clp)
|
|||
{
|
||||
dprintk("--> nfs_free_client(%u)\n", clp->rpc_ops->version);
|
||||
|
||||
nfs4_clear_client_minor_version(clp);
|
||||
nfs4_shutdown_client(clp);
|
||||
|
||||
nfs_fscache_release_client_cookie(clp);
|
||||
|
@ -1053,6 +1068,30 @@ error:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_NFS_V4
|
||||
/*
|
||||
* Initialize the minor version specific parts of an NFS4 client record
|
||||
*/
|
||||
static int nfs4_init_client_minor_version(struct nfs_client *clp)
|
||||
{
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
if (clp->cl_minorversion) {
|
||||
struct nfs4_session *session = NULL;
|
||||
/*
|
||||
* Create the session and mark it expired.
|
||||
* When a SEQUENCE operation encounters the expired session
|
||||
* it will do session recovery to initialize it.
|
||||
*/
|
||||
session = nfs4_alloc_session(clp);
|
||||
if (!session)
|
||||
return -ENOMEM;
|
||||
|
||||
clp->cl_session = session;
|
||||
}
|
||||
#endif /* CONFIG_NFS_V4_1 */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialise an NFS4 client record
|
||||
*/
|
||||
|
@ -1087,6 +1126,10 @@ static int nfs4_init_client(struct nfs_client *clp,
|
|||
}
|
||||
__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
|
||||
|
||||
error = nfs4_init_client_minor_version(clp);
|
||||
if (error < 0)
|
||||
goto error;
|
||||
|
||||
nfs_mark_client_ready(clp, NFS_CS_READY);
|
||||
return 0;
|
||||
|
||||
|
@ -1143,6 +1186,21 @@ error:
|
|||
return error;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize a session.
|
||||
* Note: save the mount rsize and wsize for create_server negotiation.
|
||||
*/
|
||||
static void nfs4_init_session(struct nfs_client *clp,
|
||||
unsigned int wsize, unsigned int rsize)
|
||||
{
|
||||
#if defined(CONFIG_NFS_V4_1)
|
||||
if (nfs4_has_session(clp)) {
|
||||
clp->cl_session->fc_attrs.max_rqst_sz = wsize;
|
||||
clp->cl_session->fc_attrs.max_resp_sz = rsize;
|
||||
}
|
||||
#endif /* CONFIG_NFS_V4_1 */
|
||||
}
|
||||
|
||||
/*
|
||||
* Create a version 4 volume record
|
||||
*/
|
||||
|
@ -1221,6 +1279,8 @@ struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data,
|
|||
BUG_ON(!server->nfs_client->rpc_ops);
|
||||
BUG_ON(!server->nfs_client->rpc_ops->file_inode_ops);
|
||||
|
||||
nfs4_init_session(server->nfs_client, server->wsize, server->rsize);
|
||||
|
||||
/* Probe the root fh to retrieve its FSID */
|
||||
error = nfs4_path_walk(server, mntfh, data->nfs_server.export_path);
|
||||
if (error < 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue