From 396512d35ab68fc8a958a0f26accf70e50f77e2e Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Wed, 1 Apr 2009 09:23:27 -0400
Subject: [PATCH] --- yaml --- r: 153609 b: refs/heads/master c:
 281fe15dc1d6ad46992f18b7a6644269ec5f7138 h: refs/heads/master i:   153607:
 3723a444e295a3c427495e1f8f8c0c79ef454815 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfs/callback_xdr.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23a55892b8e4..a8a8479744da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4aece6a19cf7f474f15eb861ba74db4479884ce3
+refs/heads/master: 281fe15dc1d6ad46992f18b7a6644269ec5f7138
diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c
index 56a3cc510107..537f21da6e5f 100644
--- a/trunk/fs/nfs/callback_xdr.c
+++ b/trunk/fs/nfs/callback_xdr.c
@@ -521,6 +521,14 @@ static unsigned encode_cb_sequence_res(struct svc_rqst *rqstp,
 static __be32
 preprocess_nfs41_op(int nop, unsigned int op_nr, struct callback_op **op)
 {
+	if (op_nr == OP_CB_SEQUENCE) {
+		if (nop != 0)
+			return htonl(NFS4ERR_SEQUENCE_POS);
+	} else {
+		if (nop == 0)
+			return htonl(NFS4ERR_OP_NOT_IN_SESSION);
+	}
+
 	switch (op_nr) {
 	case OP_CB_GETATTR:
 	case OP_CB_RECALL: