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>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 4fc5b385f61e506a972002ab53502319122661f9..49cf969417c074e41fa03cde0d0a78a6aa59b756 100644 (file)
--- 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 d837f10c49ef4fa466fe85282b12b320ddfbc7ce..f5675063f951cf5d332157fc2cbd11dd6a4eb173 100644 (file)
--- 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;
 };
 
 /*