summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authoradam radford <aradford@gmail.com>2014-03-10 02:51:45 -0700
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 10:19:21 -0700
commit3d0c24cd9bedf5a0665d60c8219a0a84c05abeb3 (patch)
tree5fde0aaa09531fe74b2d4eac2bfffc3679e58a2b /drivers/scsi/megaraid
parentc77a9bd8e05d877d9b99b77a14e0062a1c808b6c (diff)
downloadlinux-stable-3d0c24cd9bedf5a0665d60c8219a0a84c05abeb3.tar.gz
linux-stable-3d0c24cd9bedf5a0665d60c8219a0a84c05abeb3.tar.bz2
linux-stable-3d0c24cd9bedf5a0665d60c8219a0a84c05abeb3.zip
[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>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c7
1 files changed, 5 insertions, 2 deletions
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->