[iscsi-initiator-utils: 44/109] Resolves: #578455

[Chris Leech]

commit 3846e3d4dda2b3df9015eaf6b589030ec2ac6e1e
Author: mchristi <mchristi at redhat.com>
Date:   Wed May 5 14:29:08 2010 +0000

    Resolves: #578455

 iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch |   27 +++++++++++++++++++++
 iscsi-initiator-utils.spec                        |    8 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch b/iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch
new file mode 100644
index 0000000..0fb8b95
--- /dev/null
+++ b/iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch
@@ -0,0 +1,27 @@
+diff -aurp open-iscsi-2.0-872-rc1-bnx2i/usr/be2iscsi.c open-iscsi-2.0-872-rc1-bnx2i.work/usr/be2iscsi.c
+--- open-iscsi-2.0-872-rc1-bnx2i/usr/be2iscsi.c	2010-05-05 09:21:40.000000000 -0500
++++ open-iscsi-2.0-872-rc1-bnx2i.work/usr/be2iscsi.c	2010-05-05 09:21:52.000000000 -0500
+@@ -24,11 +24,11 @@ void be2iscsi_create_conn(struct iscsi_c
+ 	if (conn->max_recv_dlength > 65536)
+ 		conn->max_recv_dlength = 65536;
+ 
+-	if (conn->session->first_burst > 8192)
+-		conn->session->first_burst = 8192;
++	if (session->first_burst > 8192)
++		session->first_burst = 8192;
+ 
+-	if (conn->session->max_burst > 262144)
+-		conn->session->max_burst = 262144;
++	if (session->max_burst > 262144)
++		session->max_burst = 262144;
+ 
+ 	if (conn->max_xmit_dlength > 65536)
+ 		conn->max_xmit_dlength = 65536;
+@@ -37,5 +37,6 @@ void be2iscsi_create_conn(struct iscsi_c
+ 	    conn_rec->iscsi.MaxXmitDataSegmentLength > 65536)
+ 		conn_rec->iscsi.MaxXmitDataSegmentLength = 65536;
+ 
+-	conn->session->erl = 0;
++	session->erl = 0;
++	session->initial_r2t_en = 1;
+ }
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 3b6313b..0584fad 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc1-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -24,6 +24,8 @@ Patch5: iscsi-initiator-utils-uip-mgmt.patch
 Patch6: iscsi-initiator-utils-disable-isns-for-lib.patch
 # fix MaxXmitDataSegmentLength=0 handling
 Patch7: iscsi-initiator-utils-fix-zero-MaxXmitDataSegmentLength.patch
+# fix initial r2t handling for be2iscsi
+Patch8: iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -58,6 +60,7 @@ developing applications that use %{name}.
 %patch5 -p1 -b .uip-mgmt
 %patch6 -p1 -b .disable-isns-for-lib
 %patch7 -p1 -b .fix-zero-MaxXmitDataSegmentLength
+%patch8 -p1 -b .be2iscsi-fix-init-r2t
 
 
 %build
@@ -177,6 +180,9 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Wed May 5 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.3
+- 578455 Fix initial R2T=0 handling for be2iscsi
+
 * Wed Mar 31 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.2
 - 578455 Fix handling of MaxXmitDataSegmentLength=0 for be2iscsi