aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-04-01 09:22:04 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 10:46:29 -0700
commitf3752975caa716709c5ea0b0820b86111d921df4 (patch)
tree80349dd1e99683577ea4b0d264af7f8b3ded73aa
parentcccef3b96a4759ae0790452280c00ea505412157 (diff)
nfs41: nfs41: pass *session in seq_args and seq_res
To be used for getting the rpc's minorversion and for nfs41 xdr {en,de}coding of the sequence operation. Reset the seq session ptrs for minorversion=0 rpc calls. Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c1
-rw-r--r--include/linux/nfs_xdr.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4fc5b385f61..49cf969417c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -291,6 +291,7 @@ int _nfs4_call_sync(struct nfs_server *server,
struct nfs4_sequence_res *res,
int cache_reply)
{
+ args->sa_session = res->sr_session = NULL;
return rpc_call_sync(server->client, msg, 0);
}
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index d837f10c49e..f5675063f95 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -162,11 +162,11 @@ struct nfs4_slot {
};
struct nfs4_sequence_args {
- /* stub */
+ struct nfs4_session *sa_session;
};
struct nfs4_sequence_res {
- /* stub */
+ struct nfs4_session *sr_session;
};
/*