From c969111dc93b3128f9577baf871d66c4b9758f8c Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 17 Oct 2006 14:44:24 -0400
Subject: [PATCH] --- yaml --- r: 42510 b: refs/heads/master c:
 e744cf2e3ab8535a8494a4cf0177de26f94586da h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/sunrpc/xprt.h | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1c4a1961264e..b0b7368d4957 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24c5684b65ff52ebfa942e8086d91a4966121ae7
+refs/heads/master: e744cf2e3ab8535a8494a4cf0177de26f94586da
diff --git a/trunk/include/linux/sunrpc/xprt.h b/trunk/include/linux/sunrpc/xprt.h
index 60394fbc4c70..0321fb53bd02 100644
--- a/trunk/include/linux/sunrpc/xprt.h
+++ b/trunk/include/linux/sunrpc/xprt.h
@@ -157,11 +157,6 @@ struct rpc_xprt {
 	unsigned char		shutdown   : 1,	/* being shut down */
 				resvport   : 1; /* use a reserved port */
 
-	/*
-	 * XID
-	 */
-	__u32			xid;		/* Next XID value to use */
-
 	/*
 	 * State of TCP reply receive stuff
 	 */
@@ -193,8 +188,8 @@ struct rpc_xprt {
 	 */
 	spinlock_t		transport_lock;	/* lock transport info */
 	spinlock_t		reserve_lock;	/* lock slot table */
+	u32			xid;		/* Next XID value to use */
 	struct rpc_task *	snd_task;	/* Task blocked in send */
-
 	struct list_head	recv;
 
 	struct {