summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-16 12:58:36 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-26 17:49:52 -0500
commit2b2fa71723f955d5b4a0f4edd99cf3cd69ceafd1 (patch)
treed4ed6dc3dea4ce2530e4d98a7a36e8f1942767ad /fs/nfs/nfs4proc.c
parentdf2fabffbace8988f3265585ec793ff9deccdea7 (diff)
downloadtalos-op-linux-2b2fa71723f955d5b4a0f4edd99cf3cd69ceafd1.tar.gz
talos-op-linux-2b2fa71723f955d5b4a0f4edd99cf3cd69ceafd1.zip
NFSv4.1: Simplify struct nfs4_sequence_args too
Replace the session pointer + slotid with a pointer to the allocated slot. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4311dba49c58..6c41a34e34b4 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -591,7 +591,7 @@ out:
static void nfs41_init_sequence(struct nfs4_sequence_args *args,
struct nfs4_sequence_res *res, int cache_reply)
{
- args->sa_session = NULL;
+ args->sa_slot = NULL;
args->sa_cache_this = 0;
if (cache_reply)
args->sa_cache_this = 1;
@@ -644,8 +644,8 @@ int nfs41_setup_sequence(struct nfs4_session *session,
rpc_task_set_priority(task, RPC_PRIORITY_NORMAL);
slot = tbl->slots + slotid;
slot->renewal_time = jiffies;
- args->sa_session = session;
- args->sa_slotid = slotid;
+
+ args->sa_slot = slot;
dprintk("<-- %s slotid=%d seqid=%d\n", __func__, slotid, slot->seq_nr);
OpenPOWER on IntegriCloud