[pnfs] [PATCH 1/3] [SQUASHME] nfs41: Check that CB_SEQUENCE_CB is in position 0

Ricardo Labiaga ricardo.labiaga at netapp.com
Tue Jun 24 16:24:55 EDT 2008


As a result of commit f26a3988917913b3d11b2bd741601a2c64ab9204, the first
operation in a compound is at position 0, not position 1 as it used to
be.  Update our processing of CB_SEQUENCE_CB accordingly.

Signed-off-by: Ricardo Labiaga <ricardo.labiaga at netapp.com>
---
 fs/nfs/callback_xdr.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index fda6643..2755b75 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -645,11 +645,11 @@ static __be32 process_op(uint32_t minorversion, int nop,
 #if defined(CONFIG_NFS_V4_1)
 	if (minorversion == 1) {
 		if (op_nr == OP_CB_SEQUENCE) {
-			if (nop != 1) {
+			if (nop != 0) {
 				status = htonl(NFS4ERR_SEQUENCE_POS);
 				goto out;
 			}
-		} else if (nop == 1)
+		} else if (nop == 0)
 			status = htonl(NFS4ERR_OP_NOT_IN_SESSION);
 
 		switch (op_nr) {
-- 
1.5.3.3



More information about the pNFS mailing list