From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 17 Oct 2006 18:44:24 +0000 (-0400)
Subject: SUNRPC: minor optimization of "xid" field in rpc_xprt
X-Git-Tag: v2.6.20-rc1~34^2~412^2~51
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e744cf2e3ab8535a8494a4cf0177de26f94586da;p=linux-2.6

SUNRPC: minor optimization of "xid" field in rpc_xprt

Move the xid field in the rpc_xprt structure to be in the same cache line
as the reserve_lock, since these are used at the same time.

Test plan:
None.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 60394fbc4c..0321fb53bd 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/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 {