3 files changed, 27 insertions, 39 deletions

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 90923223a7c1..50dd55069d3d 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -222,7 +222,7 @@ extern int nfs4_setup_sequence(struct nfs_client *clp,
                 int cache_reply, struct rpc_task *task);
 extern void nfs4_destroy_session(struct nfs4_session *session);
 extern struct nfs4_session *nfs4_alloc_session(struct nfs_client *clp);
-extern int nfs4_proc_create_session(struct nfs_client *, int reset);
+extern int nfs4_proc_create_session(struct nfs_client *);
 extern int nfs4_proc_destroy_session(struct nfs4_session *);
 extern int nfs4_init_session(struct nfs_server *server);
 #else /* CONFIG_NFS_v4_1 */
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 206ce30a595d..be96d28baccf 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4501,7 +4501,6 @@ static int nfs4_reset_slot_table(struct nfs4_slot_table *tbl, int max_slots,
         spin_lock(&tbl->slot_tbl_lock);
         for (i = 0; i < max_slots; ++i)
                 tbl->slots[i].seq_nr = ivalue;
-        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);
@@ -4552,7 +4551,6 @@ static void nfs4_destroy_slot_tables(struct nfs4_session *session)
 static int nfs4_init_slot_table(struct nfs4_slot_table *tbl,
                 int max_slots, int ivalue)
 {
-        int i;
         struct nfs4_slot *slot;
         int ret = -ENOMEM;
 
@@ -4563,18 +4561,9 @@ static int nfs4_init_slot_table(struct nfs4_slot_table *tbl,
         slot = kcalloc(max_slots, sizeof(struct nfs4_slot), GFP_KERNEL);
         if (!slot)
                 goto out;
-        for (i = 0; i < max_slots; ++i)
-                slot[i].seq_nr = ivalue;
         ret = 0;
 
         spin_lock(&tbl->slot_tbl_lock);
-        if (tbl->slots != NULL) {
-                spin_unlock(&tbl->slot_tbl_lock);
-                dprintk("%s: slot table already initialized. tbl=%p slots=%p\n",
-                        __func__, tbl, tbl->slots);
-                WARN_ON(1);
-                goto out_free;
-        }
         tbl->max_slots = max_slots;
         tbl->slots = slot;
         tbl->highest_used_slotid = -1;  /* no slot is currently used */
@@ -4584,10 +4573,6 @@ static int nfs4_init_slot_table(struct nfs4_slot_table *tbl,
 out:
         dprintk("<-- %s: return %d\n", __func__, ret);
         return ret;
-
-out_free:
-        kfree(slot);
-        goto out;
 }
 
 /*
@@ -4595,17 +4580,24 @@ out_free:
  */
 static int nfs4_init_slot_tables(struct nfs4_session *session)
 {
-        int status;
+        struct nfs4_slot_table *tbl;
+        int status = 0;
 
-        status = nfs4_init_slot_table(&session->fc_slot_table,
-                        session->fc_attrs.max_reqs, 1);
-        if (status)
-                return status;
+        tbl = &session->fc_slot_table;
+        if (tbl->slots == NULL) {
+                status = nfs4_init_slot_table(tbl,
+                                session->fc_attrs.max_reqs, 1);
+                if (status)
+                        return status;
+        }
 
-        status = nfs4_init_slot_table(&session->bc_slot_table,
-                        session->bc_attrs.max_reqs, 0);
-        if (status)
-                nfs4_destroy_slot_tables(session);
+        tbl = &session->bc_slot_table;
+        if (tbl->slots == NULL) {
+                status = nfs4_init_slot_table(tbl,
+                                session->bc_attrs.max_reqs, 0);
+                if (status)
+                        nfs4_destroy_slot_tables(session);
+        }
 
         return status;
 }
@@ -4784,7 +4776,7 @@ static int _nfs4_proc_create_session(struct nfs_client *clp)
  * It is the responsibility of the caller to verify the session is
  * expired before calling this routine.
  */
-int nfs4_proc_create_session(struct nfs_client *clp, int reset)
+int nfs4_proc_create_session(struct nfs_client *clp)
 {
         int status;
         unsigned *ptr;
@@ -4797,12 +4789,13 @@ int nfs4_proc_create_session(struct nfs_client *clp, int reset)
         if (status)
                 goto out;
 
-        /* Init or reset the fore channel */
-        if (reset)
-                status = nfs4_reset_slot_tables(session);
-        else
-                status = nfs4_init_slot_tables(session);
-        dprintk("fore channel slot table initialization returned %d\n", status);
+        /* Init and reset the fore channel */
+        status = nfs4_init_slot_tables(session);
+        dprintk("slot table initialization returned %d\n", status);
+        if (status)
+                goto out;
+        status = nfs4_reset_slot_tables(session);
+        dprintk("slot table reset returned %d\n", status);
         if (status)
                 goto out;
 
@@ -4810,10 +4803,6 @@ int nfs4_proc_create_session(struct nfs_client *clp, int reset)
         dprintk("%s client>seqid %d sessionid %u:%u:%u:%u\n", __func__,
                 clp->cl_seqid, ptr[0], ptr[1], ptr[2], ptr[3]);
 
-        if (reset)
-                /* Lease time is aleady set */
-                goto out;
-
         /* Get the lease time */
         status = nfs4_proc_get_lease_time(clp, &fsinfo);
         if (status == 0) {
@@ -4821,7 +4810,6 @@ int nfs4_proc_create_session(struct nfs_client *clp, int reset)
                 spin_lock(&clp->cl_lock);
                 clp->cl_lease_time = fsinfo.lease_time * HZ;
                 clp->cl_last_renewal = jiffies;
-                clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
                 spin_unlock(&clp->cl_lock);
 
                 nfs4_schedule_state_renewal(clp);
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 873dda7fec3e..37f020eb92f2 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -123,7 +123,7 @@ int nfs41_init_clientid(struct nfs_client *clp, struct rpc_cred *cred)
         status = nfs4_proc_exchange_id(clp, cred);
         if (status == 0)
                 /* create session schedules state renewal upon success */
-                status = nfs4_proc_create_session(clp, 0);
+                status = nfs4_proc_create_session(clp);
         if (status == 0)
                 nfs_mark_client_ready(clp, NFS_CS_READY);
         return status;
@@ -1240,7 +1240,7 @@ static int nfs4_reset_session(struct nfs_client *clp)
         }
 
         memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);
-        status = nfs4_proc_create_session(clp, 1);
+        status = nfs4_proc_create_session(clp);
         if (status)
                 nfs4_session_recovery_handle_error(clp, status);
                 /* fall through*/