hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfs41: reset the session slot table 

Separated from nfs41: schedule async session reset

Do not kfree the session slot table upon session reset, just re-initialize it.
Add a boolean to nfs4_proc_create_session to inidicate if this is a
session reset or a session initialization.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Andy Adamson 2009-04-01 09:22:37 -04:00 committed by Benny Halevy
parent fc01cea963
commit ac72b7b3b3
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fs/nfs/nfs4proc.c
View File

@ -4289,6 +4289,37 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
return status; return status;
} }
/* Reset a slot table */
static int nfs4_reset_slot_table(struct nfs4_session *session)
{
struct nfs4_slot_table *tbl = &session->fc_slot_table;
int i, max_slots = session->fc_attrs.max_reqs;
int old_max_slots = session->fc_slot_table.max_slots;
int ret = 0;
dprintk("--> %s: max_reqs=%u, tbl %p\n", __func__,
session->fc_attrs.max_reqs, tbl);
/* Until we have dynamic slot table adjustment, insist
* upon the same slot table size */
if (max_slots != old_max_slots) {
dprintk("%s reset slot table does't match old\n",
__func__);
ret = -EINVAL; /*XXX NFS4ERR_REQ_TOO_BIG ? */
goto out;
}
spin_lock(&tbl->slot_tbl_lock);
for (i = 0; i < max_slots; ++i)
tbl->slots[i].seq_nr = 1;
tbl->highest_used_slotid = -1;
spin_unlock(&tbl->slot_tbl_lock);
dprintk("%s: tbl=%p slots=%p max_slots=%d\n", __func__,
tbl, tbl->slots, tbl->max_slots);
out:
dprintk("<-- %s: return %d\n", __func__, ret);
return ret;
}
/* /*
* Initialize slot table * Initialize slot table
*/ */
@ -4497,7 +4528,7 @@ static int _nfs4_proc_create_session(struct nfs_client *clp)
* It is the responsibility of the caller to verify the session is * It is the responsibility of the caller to verify the session is
* expired before calling this routine. * expired before calling this routine.
*/ */
int nfs4_proc_create_session(struct nfs_client *clp) int nfs4_proc_create_session(struct nfs_client *clp, int reset)
{ {
int status; int status;
unsigned *ptr; unsigned *ptr;
@ -4510,7 +4541,10 @@ int nfs4_proc_create_session(struct nfs_client *clp)
if (status) if (status)
goto out; goto out;
/* Init the fore channel */ /* Init or reset the fore channel */
if (reset)
status = nfs4_reset_slot_table(session);
else
status = nfs4_init_slot_table(session); status = nfs4_init_slot_table(session);
dprintk("fore channel slot table initialization returned %d\n", status); dprintk("fore channel slot table initialization returned %d\n", status);
if (status) if (status)
@ -4520,6 +4554,10 @@ int nfs4_proc_create_session(struct nfs_client *clp)
dprintk("%s client>seqid %d sessionid %u:%u:%u:%u\n", __func__, dprintk("%s client>seqid %d sessionid %u:%u:%u:%u\n", __func__,
clp->cl_seqid, ptr[0], ptr[1], ptr[2], ptr[3]); clp->cl_seqid, ptr[0], ptr[1], ptr[2], ptr[3]);
if (reset)
/* Lease time is aleady set */
goto out;
/* Get the lease time */ /* Get the lease time */
status = nfs4_proc_get_lease_time(clp, &fsinfo); status = nfs4_proc_get_lease_time(clp, &fsinfo);
if (status == 0) { if (status == 0) {