[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 <[email protected]>
Signed-off-by: James Bottomley <[email protected]>

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index f77715adf6bd18193fecb6f76fc5b0aeb5a251c9..99b7bffb36fe366c02ea3fda1878acf098894e2a 100644 (file)
--- 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->