forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSv4.1: Label each entry in the session slot tables with its slot number

Browse source 
Instead of doing slot table pointer gymnastics every time we want to
know which slot we're using.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-11-16 12:45:06 -05:00
commit df2fabffba
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fs/nfs/nfs4proc.c
View file

@ -526,9 +526,9 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
* returned NFS4ERR_DELAY as per Section 2.10.6.2
* of RFC5661.
*/
dprintk("%s: slot=%td seq=%d: Operation in progress\n",
dprintk("%s: slot=%u seq=%u: Operation in progress\n",
__func__,
slot - session->fc_slot_table.slots,
slot->slot_nr,
slot->seq_nr);
goto out_retry;
default:
@ -671,9 +671,9 @@ int nfs4_setup_sequence(const struct nfs_server *server,
if (session == NULL)
goto out;
dprintk("--> %s clp %p session %p sr_slot %td\n",
dprintk("--> %s clp %p session %p sr_slot %d\n",
__func__, session->clp, session, res->sr_slot ?
res->sr_slot - session->fc_slot_table.slots : -1);
res->sr_slot->slot_nr : -1);
ret = nfs41_setup_sequence(session, args, res, task);
out:
@ -5669,8 +5669,10 @@ struct nfs4_slot *nfs4_alloc_slots(struct nfs4_slot_table *table,
tbl = kmalloc_array(max_slots, sizeof(*tbl), gfp_flags);
if (tbl != NULL) {
for (i = 0; i < max_slots; i++)
for (i = 0; i < max_slots; i++) {
tbl[i].table = table;
tbl[i].slot_nr = i;
}
}
return tbl;
}

2
fs/nfs/nfs4xdr.c
View file

@ -5547,7 +5547,7 @@ static int decode_sequence(struct xdr_stream *xdr,
}
/* slot id */
dummy = be32_to_cpup(p++);
if (dummy != res->sr_slot - session->fc_slot_table.slots) {
if (dummy != res->sr_slot->slot_nr) {
dprintk("%s Invalid slot id\n", __func__);
goto out_err;
}

1
include/linux/nfs_xdr.h
View file

@ -189,6 +189,7 @@ struct nfs4_channel_attrs {
struct nfs4_slot {
struct nfs4_slot_table *table;
unsigned long renewal_time;
u32 slot_nr;
u32 seq_nr;
};