Commit 104aeba4 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

nfs41: resize slot table in reset 



When session is reset, client can renegotiate slot table size.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b9efa1b2

fs/nfs/nfs4proc.c

+21 −19
Original line number Diff line number Diff line
@@ -4618,26 +4618,32 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) 
/*

 * Reset a slot table

 */

static int nfs4_reset_slot_table(struct nfs4_slot_table *tbl, int max_slots,

		int old_max_slots, int ivalue)

static int nfs4_reset_slot_table(struct nfs4_slot_table *tbl, u32 max_reqs,

				 int ivalue)

{

	struct nfs4_slot *new = NULL;

	int i;

	int ret = 0;



	dprintk("--> %s: max_reqs=%u, tbl %p\n", __func__, max_slots, tbl);

	dprintk("--> %s: max_reqs=%u, tbl->max_slots %d\n", __func__,

		max_reqs, tbl->max_slots);



	/*

	 * 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 ? */

	/* Does the newly negotiated max_reqs match the existing slot table? */

	if (max_reqs != tbl->max_slots) {

		ret = -ENOMEM;

		new = kmalloc(max_reqs * sizeof(struct nfs4_slot),

			      GFP_KERNEL);

		if (!new)

			goto out;

		ret = 0;

		kfree(tbl->slots);

	}

	spin_lock(&tbl->slot_tbl_lock);

	for (i = 0; i < max_slots; ++i)

	if (new) {

		tbl->slots = new;

		tbl->max_slots = max_reqs;

	}

	for (i = 0; i < tbl->max_slots; ++i)

		tbl->slots[i].seq_nr = ivalue;

	spin_unlock(&tbl->slot_tbl_lock);

	dprintk("%s: tbl=%p slots=%p max_slots=%d\n", __func__,
@@ -4655,16 +4661,12 @@ static int nfs4_reset_slot_tables(struct nfs4_session *session) 
	int status;



	status = nfs4_reset_slot_table(&session->fc_slot_table,

			session->fc_attrs.max_reqs,

			session->fc_slot_table.max_slots,

			1);

			session->fc_attrs.max_reqs, 1);

	if (status)

		return status;



	status = nfs4_reset_slot_table(&session->bc_slot_table,

			session->bc_attrs.max_reqs,

			session->bc_slot_table.max_slots,

			0);

			session->bc_attrs.max_reqs, 0);

	return status;

}