From 17969c6526820d57c182a34da33c54e684d66666 Mon Sep 17 00:00:00 2001
From: Joe Eykholt <jeykholt@cisco.com>
Date: Tue, 20 Jul 2010 15:19:42 -0700
Subject: [PATCH] --- yaml --- r: 204255 b: refs/heads/master c:
 f90377abcab2e305450ee76a0f9042907560c5d8 h: refs/heads/master i:   204253:
 080a1a605aadaca72c29c26d99dadcb0419263e0   204251:
 61e3b24d87e86dd9847f0cea60132fb884e2607f   204247:
 98e6d00625809125db0b2b4c1211324d1ba0889f   204239:
 420cd57ba4d52ed2b02e502d38168bed618049db   204223:
 ec203f4b59f0e532699bb457824f1c9b6b3f4ed6 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/libfc/fc_rport.c | 2 +-
 trunk/include/scsi/libfc.h          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4ebe9abf2cc0..84f0d40e4ad4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42e9041467cf5fd33501b91b27e26807c259c896
+refs/heads/master: f90377abcab2e305450ee76a0f9042907560c5d8
diff --git a/trunk/drivers/scsi/libfc/fc_rport.c b/trunk/drivers/scsi/libfc/fc_rport.c
index 6b569732f892..6d68482649c9 100644
--- a/trunk/drivers/scsi/libfc/fc_rport.c
+++ b/trunk/drivers/scsi/libfc/fc_rport.c
@@ -127,7 +127,7 @@ static struct fc_rport_priv *fc_rport_create(struct fc_lport *lport,
 	if (rdata)
 		return rdata;
 
-	rdata = kzalloc(sizeof(*rdata), GFP_KERNEL);
+	rdata = kzalloc(sizeof(*rdata) + lport->rport_priv_size, GFP_KERNEL);
 	if (!rdata)
 		return NULL;
 
diff --git a/trunk/include/scsi/libfc.h b/trunk/include/scsi/libfc.h
index b0310b9b3469..fcbee8c38b0c 100644
--- a/trunk/include/scsi/libfc.h
+++ b/trunk/include/scsi/libfc.h
@@ -799,6 +799,7 @@ struct fc_disc {
  * @mfs:                   The maximum Fibre Channel payload size
  * @max_retry_count:       The maximum retry attempts
  * @max_rport_retry_count: The maximum remote port retry attempts
+ * @rport_priv_size:       Size needed by driver after struct fc_rport_priv
  * @lro_xid:               The maximum XID for LRO
  * @lso_max:               The maximum large offload send size
  * @fcts:                  FC-4 type mask
@@ -848,6 +849,7 @@ struct fc_lport {
 	u32			       mfs;
 	u8			       max_retry_count;
 	u8			       max_rport_retry_count;
+	u16			       rport_priv_size;
 	u16			       link_speed;
 	u16			       link_supported_speeds;
 	u16			       lro_xid;