From ebc43696ffa6893701008f6b2807b9e18465098b Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 5 Feb 2013 00:05:54 +0000
Subject: [PATCH] Backport mainline commit
 a55aac79de0ea6fc52d35f535867b6573a5ff0f8:

[SCSI] qla2xxx: Propagate up abort failures



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4754 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t/qla2x00-target/README | 5 +++--
 qla2x00t/qla_os.c              | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README
index b50bd47f5..0e9e7e3d2 100644
--- a/qla2x00t/qla2x00-target/README
+++ b/qla2x00t/qla2x00-target/README
@@ -18,14 +18,15 @@ supported, because it's too hard to backport used initiator driver to
 older kernels.
 
 The original initiator driver was taken from the kernel 2.6.26. Also the
-following 2.6.26.x commits have been applied to it (upstream ID):
+following 2.6.26+ commits have been applied to it (upstream ID):
 048feec5548c0582ee96148c61b87cccbcb5f9be,
 031e134e5f95233d80fb1b62fdaf5e1be587597c,
 5f3a9a207f1fccde476dd31b4c63ead2967d934f,
 85821c906cf3563a00a3d98fa380a2581a7a5ff1,
 3c01b4f9fbb43fc911acd33ea7a14ea7a4f9866b,
 8eca3f39c4b11320787f7b216f63214aee8415a9,
-0f19bc681ed0849a2b95778460a0a8132e3700e2.
+0f19bc681ed0849a2b95778460a0a8132e3700e2,
+a55aac79de0ea6fc52d35f535867b6573a5ff0f8.
 
 See also "ToDo" file for list of known issues and unimplemented
 features.
diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c
index 3336574ee..1c857d440 100644
--- a/qla2x00t/qla_os.c
+++ b/qla2x00t/qla_os.c
@@ -809,6 +809,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 
 		spin_unlock_irqrestore(&pha->hardware_lock, flags);
 		if (ha->isp_ops->abort_command(ha, sp)) {
+			ret = FAILED;
 			DEBUG2(printk("%s(%ld): abort_command "
 			    "mbx failed.\n", __func__, ha->host_no));
 		} else {