From aaf2ec8244138441367f44ee09638ff09f402b93 Mon Sep 17 00:00:00 2001
From: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Date: Thu, 10 Sep 2009 12:26:12 +0300
Subject: [PATCH] --- yaml --- r: 164643 b: refs/heads/master c:
 132f97715c098393fb8de3c26b07b9fdbd2334f1 h: refs/heads/master i:   164641:
 4519ea9bf9d9841b9ec698efa06e3486bc05b6cd   164639:
 0511a0c8e0d3a5eb9897e9000645b0356040bfaf v: v3

---
 [refs]                           | 2 +-
 trunk/fs/nfsd/nfs4callback.c     | 5 +++++
 trunk/include/linux/nfsd/state.h | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d9bbc91360c..6791653e2816 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38524ab38f2752beee262a97403d871665838172
+refs/heads/master: 132f97715c098393fb8de3c26b07b9fdbd2334f1
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index db4188ce9b00..f31175717c1a 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -92,6 +92,11 @@ enum nfs_cb_opnum4 {
 					cb_sequence_dec_sz +            \
 					op_dec_sz)
 
+struct nfs4_rpc_args {
+	void				*args_op;
+	struct nfsd4_cb_sequence	args_seq;
+};
+
 /*
 * Generic encode routines from fs/nfs/nfs4xdr.c
 */
diff --git a/trunk/include/linux/nfsd/state.h b/trunk/include/linux/nfsd/state.h
index c916032570c4..0e5b5aecde03 100644
--- a/trunk/include/linux/nfsd/state.h
+++ b/trunk/include/linux/nfsd/state.h
@@ -60,6 +60,12 @@ typedef struct {
 #define si_stateownerid   si_opaque.so_stateownerid
 #define si_fileid         si_opaque.so_fileid
 
+struct nfsd4_cb_sequence {
+	/* args/res */
+	u32			cbs_minorversion;
+	struct nfs4_client	*cbs_clp;
+};
+
 struct nfs4_delegation {
 	struct list_head	dl_perfile;
 	struct list_head	dl_perclnt;