summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasu Dev <vasu.dev@intel.com>2011-09-27 21:38:02 -0700
committerJames Bottomley <JBottomley@Parallels.com>2011-10-02 12:56:26 -0500
commit49a198898e889038c6601288cd2b0e037edada24 (patch)
tree4f233125a6e946cc03afd80b41e9343861f57022
parented26cfece6177310ad8f5896651a3187ce02711c (diff)
downloadblackbird-obmc-linux-49a198898e889038c6601288cd2b0e037edada24.tar.gz
blackbird-obmc-linux-49a198898e889038c6601288cd2b0e037edada24.zip
[SCSI] libfc: cache align struct fc_exch fields
cache aligned xid and ex_lock beside removing holes. Signed-off-by: Vasu Dev <vasu.dev@intel.com> Tested-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Yi Zou <yi.zou@intel.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--include/scsi/libfc.h27
1 files changed, 12 insertions, 15 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 05e2583d8fa6..5d1a758e0595 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -406,35 +406,32 @@ struct fc_seq {
* sequence allocation
*/
struct fc_exch {
+ spinlock_t ex_lock;
+ atomic_t ex_refcnt;
+ enum fc_class class;
struct fc_exch_mgr *em;
struct fc_exch_pool *pool;
- u32 state;
- u16 xid;
struct list_head ex_list;
- spinlock_t ex_lock;
- atomic_t ex_refcnt;
- struct delayed_work timeout_work;
struct fc_lport *lp;
+ u32 esb_stat;
+ u8 state;
+ u8 fh_type;
+ u8 seq_id;
+ u8 encaps;
+ u16 xid;
u16 oxid;
u16 rxid;
u32 oid;
u32 sid;
u32 did;
- u32 esb_stat;
u32 r_a_tov;
- u8 seq_id;
- u8 encaps;
u32 f_ctl;
- u8 fh_type;
- enum fc_class class;
- struct fc_seq seq;
-
+ struct fc_seq seq;
void (*resp)(struct fc_seq *, struct fc_frame *, void *);
void *arg;
-
void (*destructor)(struct fc_seq *, void *);
-
-};
+ struct delayed_work timeout_work;
+} ____cacheline_aligned_in_smp;
#define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
OpenPOWER on IntegriCloud