From 799eb5b376581307e77f2cbf5ca1a5dd63c7235c Mon Sep 17 00:00:00 2001
From: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Date: Wed, 1 Apr 2009 09:23:30 -0400
Subject: [PATCH] --- yaml --- r: 153611 b: refs/heads/master c:
 65fc64e547c794764a441e16e95bb76c0e256bd7 h: refs/heads/master i:   153609:
 396512d35ab68fc8a958a0f26accf70e50f77e2e   153607:
 3723a444e295a3c427495e1f8f8c0c79ef454815 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/nfs/callback.h     | 4 ++--
 trunk/fs/nfs/callback_xdr.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 40e4a128f0f2..bb194243bfd5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd2b63d049480979016b959abc2d141cdddb1389
+refs/heads/master: 65fc64e547c794764a441e16e95bb76c0e256bd7
diff --git a/trunk/fs/nfs/callback.h b/trunk/fs/nfs/callback.h
index 576f51f4dc52..07baa8254ca1 100644
--- a/trunk/fs/nfs/callback.h
+++ b/trunk/fs/nfs/callback.h
@@ -84,7 +84,7 @@ struct referring_call_list {
 };
 
 struct cb_sequenceargs {
-	struct sockaddr_in		*csa_addr;
+	struct sockaddr			*csa_addr;
 	struct nfs4_sessionid		csa_sessionid;
 	uint32_t			csa_sequenceid;
 	uint32_t			csa_slotid;
@@ -95,7 +95,7 @@ struct cb_sequenceargs {
 };
 
 struct cb_sequenceres {
-	uint32_t			csr_status;
+	__be32				csr_status;
 	struct nfs4_sessionid		csr_sessionid;
 	uint32_t			csr_sequenceid;
 	uint32_t			csr_slotid;
diff --git a/trunk/fs/nfs/callback_xdr.c b/trunk/fs/nfs/callback_xdr.c
index 537f21da6e5f..e5a2dac5f715 100644
--- a/trunk/fs/nfs/callback_xdr.c
+++ b/trunk/fs/nfs/callback_xdr.c
@@ -283,7 +283,7 @@ static unsigned decode_cb_sequence_args(struct svc_rqst *rqstp,
 	if (unlikely(p == NULL))
 		goto out;
 
-	args->csa_addr = svc_addr_in(rqstp);
+	args->csa_addr = svc_addr(rqstp);
 	args->csa_sequenceid = ntohl(*p++);
 	args->csa_slotid = ntohl(*p++);
 	args->csa_highestslotid = ntohl(*p++);