NFSv4.1: Shrink struct nfs4_sequence_res by moving the session pointer

[platform/adaptation/renesas_rcar/renesas_kernel.git] / fs / nfs / nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 14b3974..5b61c4a 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -467,25 +467,28 @@ void nfs4_check_drain_bc_complete(struct nfs4_session *ses)
 
 static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
 {
+       struct nfs4_session *session;
        struct nfs4_slot_table *tbl;
 
-       tbl = &res->sr_session->fc_slot_table;
        if (!res->sr_slot) {
                /* just wake up the next guy waiting since
                 * we may have not consumed a slot after all */
                dprintk("%s: No slot\n", __func__);
                return;
        }
+       tbl = res->sr_slot->table;
+       session = tbl->session;
 
        spin_lock(&tbl->slot_tbl_lock);
        nfs4_free_slot(tbl, res->sr_slot - tbl->slots);
-       nfs4_check_drain_fc_complete(res->sr_session);
+       nfs4_check_drain_fc_complete(session);
        spin_unlock(&tbl->slot_tbl_lock);
        res->sr_slot = NULL;
 }
 
 static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res)
 {
+       struct nfs4_session *session;
        struct nfs4_slot *slot;
        unsigned long timestamp;
        struct nfs_client *clp;
@@ -504,6 +507,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
                goto out;
 
        slot = res->sr_slot;
+       session = slot->table->session;
 
        /* Check the SEQUENCE operation status */
        switch (res->sr_status) {
@@ -511,7 +515,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
                /* Update the slot's sequence and clientid lease timer */
                ++slot->seq_nr;
                timestamp = slot->renewal_time;
-               clp = res->sr_session->clp;
+               clp = session->clp;
                do_renew_lease(clp, timestamp);
                /* Check sequence flags */
                if (res->sr_status_flags != 0)
@@ -524,7 +528,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
                 */
                dprintk("%s: slot=%td seq=%d: Operation in progress\n",
                        __func__,
-                       slot - res->sr_session->fc_slot_table.slots,
+                       slot - session->fc_slot_table.slots,
                        slot->seq_nr);
                goto out_retry;
        default:
@@ -546,7 +550,7 @@ out_retry:
 static int nfs4_sequence_done(struct rpc_task *task,
                               struct nfs4_sequence_res *res)
 {
-       if (res->sr_session == NULL)
+       if (res->sr_slot == NULL)
                return 1;
        return nfs41_sequence_done(task, res);
 }
@@ -591,7 +595,6 @@ static void nfs41_init_sequence(struct nfs4_sequence_args *args,
        args->sa_cache_this = 0;
        if (cache_reply)
                args->sa_cache_this = 1;
-       res->sr_session = NULL;
        res->sr_slot = NULL;
 }
 
@@ -646,7 +649,6 @@ int nfs41_setup_sequence(struct nfs4_session *session,
 
        dprintk("<-- %s slotid=%d seqid=%d\n", __func__, slotid, slot->seq_nr);
 
-       res->sr_session = session;
        res->sr_slot = slot;
        res->sr_status_flags = 0;
        /*
@@ -5659,9 +5661,18 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
        return status;
 }
 
-struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags)
+struct nfs4_slot *nfs4_alloc_slots(struct nfs4_slot_table *table,
+               u32 max_slots, gfp_t gfp_flags)
 {
-       return kmalloc_array(max_slots, sizeof(struct nfs4_slot), gfp_flags);
+       struct nfs4_slot *tbl;
+       u32 i;
+
+       tbl = kmalloc_array(max_slots, sizeof(*tbl), gfp_flags);
+       if (tbl != NULL) {
+               for (i = 0; i < max_slots; i++)
+                       tbl[i].table = table;
+       }
+       return tbl;
 }
 
 static void nfs4_add_and_init_slots(struct nfs4_slot_table *tbl,
@@ -5699,7 +5710,7 @@ static int nfs4_realloc_slot_table(struct nfs4_slot_table *tbl, u32 max_reqs,
 
        /* Does the newly negotiated max_reqs match the existing slot table? */
        if (max_reqs != tbl->max_slots) {
-               new = nfs4_alloc_slots(max_reqs, GFP_NOFS);
+               new = nfs4_alloc_slots(tbl, max_reqs, GFP_NOFS);
                if (!new)
                        goto out;
        }
@@ -5738,11 +5749,13 @@ static int nfs4_setup_session_slot_tables(struct nfs4_session *ses)
        dprintk("--> %s\n", __func__);
        /* Fore channel */
        tbl = &ses->fc_slot_table;
+       tbl->session = ses;
        status = nfs4_realloc_slot_table(tbl, ses->fc_attrs.max_reqs, 1);
        if (status) /* -ENOMEM */
                return status;
        /* Back channel */
        tbl = &ses->bc_slot_table;
+       tbl->session = ses;
        status = nfs4_realloc_slot_table(tbl, ses->bc_attrs.max_reqs, 0);
        if (status && tbl->slots == NULL)
                /* Fore and back channel share a connection so get