From eab0809579de53677465f5e6e0e08b0b7591082f Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Tue, 12 Aug 2008 20:42:51 +0300
Subject: [PATCH] --- yaml --- r: 114303 b: refs/heads/master c:
 8e40741494bd08a15af17b8cfd26a1f7ad1f5081 h: refs/heads/master i:   114301:
 a685a5f986a8b6c1f7231b0f8d7f3523eeb3633d   114299:
 dfd5f0dc7a9a8856229ecf8a81c9bd9019083393   114295:
 789cbe3258d566ce97943fd23d63df6747774745   114287:
 a7c553902b3661c3d897797fcbaf494947f485cb   114271:
 8e20a59b282ce872d18a0d5c51328e66f915530b   114239:
 53db01d55f1bfdfd066eca166bfc29fe3593f138   114175:
 d406eedace545c76c0fb1c871131a0fc82a24f39 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfsd/nfs4callback.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 445ecb3eae24..4c2d11c8a4c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfcd17a6c5529bc37234cfa720a047cf9397bcfc
+refs/heads/master: 8e40741494bd08a15af17b8cfd26a1f7ad1f5081
diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c
index 702fa577aa6e..ab13e02c5683 100644
--- a/trunk/fs/nfsd/nfs4callback.c
+++ b/trunk/fs/nfsd/nfs4callback.c
@@ -225,7 +225,8 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec)
 
 	RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len);
 	WRITE32(OP_CB_RECALL);
-	WRITEMEM(&cb_rec->cbr_stateid, sizeof(stateid_t));
+	WRITE32(cb_rec->cbr_stateid.si_generation);
+	WRITEMEM(&cb_rec->cbr_stateid.si_opaque, sizeof(stateid_opaque_t));
 	WRITE32(cb_rec->cbr_trunc);
 	WRITE32(len);
 	WRITEMEM(cb_rec->cbr_fhval, len);