From b78cf894b65b1966da0a917f7dd6b30b5e1d4616 Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Tue, 12 Aug 2008 20:45:28 +0300
Subject: [PATCH] --- yaml --- r: 114307 b: refs/heads/master c:
 1b6b2257dc5a88aae375ff44485f8d6c4ee800e4 h: refs/heads/master i:   114305:
 48c3038375536c25dcd66e06ed190ce0b7b2cfd6   114303:
 eab0809579de53677465f5e6e0e08b0b7591082f v: v3

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

diff --git a/[refs] b/[refs]
index 7772050d0c46..df9c483f7e7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2f282b9f0538e4f63255ffa35bf3b902f5fbde2
+refs/heads/master: 1b6b2257dc5a88aae375ff44485f8d6c4ee800e4
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index c560af8c69d2..1b81f1656bc2 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -1183,7 +1183,6 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
  * Header routine to setup seqid operation replay cache
  */
 #define ENCODE_SEQID_OP_HEAD					\
-	__be32 *p;						\
 	__be32 *save;						\
 								\
 	save = resp->p;
@@ -2129,6 +2128,7 @@ nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_li
 static __be32
 nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_open *open)
 {
+	ENCODE_HEAD;
 	ENCODE_SEQID_OP_HEAD;
 
 	if (nfserr)