[PATCH 1/8] iscsi: add rdma attr

[PATCH 1/8] iscsi: add rdma attr

[Mike Christie]

>From Erez Zilber:

Add AF and RDMA provider properties.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Alex Aizman <itn780@yahoo.com>
Signed-off-by: Dmitry Yusupov <dmitry_yus@yahoo.com>

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 4fea3e4..0027973 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -3590,6 +3590,8 @@ static struct iscsi_transport iscsi_tcp_
 	.name			= "tcp",
 	.caps			= CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST
 				  | CAP_DATADGST,
+	.af			= AF_INET,
+	.rdma			= 0,
 	.host_template		= &iscsi_sht,
 	.hostdata_size		= sizeof(struct iscsi_session),
 	.max_conn		= 1,
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 49fd18c..bb2a3ee 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -117,6 +117,8 @@ show_transport_attr(caps, "0x%x");
 show_transport_attr(max_lun, "%d");
 show_transport_attr(max_conn, "%d");
 show_transport_attr(max_cmd_len, "%d");
+show_transport_attr(af, "%d");
+show_transport_attr(rdma, "%d");
 
 static struct attribute *iscsi_transport_attrs[] = {
 	&class_device_attr_handle.attr,
@@ -124,6 +126,8 @@ static struct attribute *iscsi_transport
 	&class_device_attr_max_lun.attr,
 	&class_device_attr_max_conn.attr,
 	&class_device_attr_max_cmd_len.attr,
+	&class_device_attr_af.attr,
+	&class_device_attr_rdma.attr,
 	NULL,
 };
 
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index f25041c..da44477 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -47,6 +47,8 @@ struct iscsi_transport {
 	struct module *owner;
 	char *name;
 	unsigned int caps;
+	unsigned short af;
+	unsigned short rdma;
 	struct scsi_host_template *host_template;
 	int hostdata_size;
 	int max_lun;

Re: [PATCH 1/8] iscsi: add rdma attr

[Christoph Hellwig]

On Tue, Nov 29, 2005 at 11:12:42PM -0600, Mike Christie wrote:
> >From Erez Zilber:
> 
> Add AF and RDMA provider properties.

NACK, they're totally useless with the current kernel.

Re: [PATCH 1/8] iscsi: add rdma attr

[Mike Christie]

Christoph Hellwig wrote:
> On Tue, Nov 29, 2005 at 11:12:42PM -0600, Mike Christie wrote:
> 
>>>From Erez Zilber:
>>
>>Add AF and RDMA provider properties.
> 
> 
> NACK, they're totally useless with the current kernel.
> 

This patchset works without those two patches. Kinda suspected you and 
Dimitry and Alex would not agree on those patches, so already tested 
without them :) Open-iscsi will need to just fixup userspace to account 
for this which has been brought up before so no biggie. Do you guys want 
me to make up a new patchset or will you just pick up the patchset 
without this patch and "[PATCH 4/8] iscsi: add rdma extensions"? Not 
merging those patches, makes this a all bug fix patchset so maybe it is 
2.6.15 worthy.