From: adam radford <aradford@gmail.com>
Date: Mon, 10 Mar 2014 09:51:45 +0000 (-0700)
Subject: [SCSI] megaraid_sas: Return leaked MPT frames to MPT frame pool
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3d0c24cd9bedf5a0665d60c8219a0a84c05abeb3;p=deliverable%2Flinux.git

[SCSI] megaraid_sas: Return leaked MPT frames to MPT frame pool

The following patch for megaraid_sas will return leaked MPT frames from any
polled DCMD's that timeout to the MPT frame pool.

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index f77715adf6bd..99b7bffb36fe 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2435,11 +2435,14 @@ int megasas_reset_fusion(struct Scsi_Host *shost)
 							instance,
 							cmd_mfi->context.smid
 							-1);
-						if (!req_desc)
+						if (!req_desc) {
 							printk(KERN_WARNING
 							       "req_desc NULL"
 							       "\n");
-						else {
+							/* Return leaked MPT
+							   frame */
+							megasas_return_cmd_fusion(instance, cmd_fusion);
+						} else {
 							instance->instancet->
 							fire_cmd(instance,
 								 req_desc->