X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=include%2Flinux%2Fnfsd%2Fstate.h;h=128298c0362d488e113ab34649dfd3643e319fa3;hb=a5ef7ca0e2636bad0ccd07b996d775348ae2b65e;hp=db348f7493763507885ec8833d796c6d3b2345bd;hpb=47f9940c55c0bdc65188749cae4e841601f513bb;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index db348f7..128298c 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -98,8 +98,6 @@ struct nfs4_callback {
 	u32                     cb_ident;
 	/* RPC client info */
 	atomic_t		cb_set;     /* successful CB_NULL call */
-	struct rpc_program      cb_program;
-	struct rpc_stat         cb_stat;
 	struct rpc_clnt *       cb_client;
 };
 
@@ -126,6 +124,8 @@ struct nfs4_client {
 	nfs4_verifier		cl_verifier; 	/* generated by client */
 	time_t                  cl_time;        /* time of last lease renewal */
 	__be32			cl_addr; 	/* client ipaddress */
+	u32			cl_flavor;	/* setclientid pseudoflavor */
+	char			*cl_principal;	/* setclientid principal name */
 	struct svc_cred		cl_cred; 	/* setclientid principal */
 	clientid_t		cl_clientid;	/* generated by server */
 	nfs4_verifier		cl_confirm;	/* generated by server */