Commit f3162483 authored Feb 25, 2011 by Parikh, Neerav Committed by James Bottomley Feb 28, 2011

[SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"



When abort for an exchange timed out it didn't release the reference to
the exchange resulting in a memory leak.

After discussion with the author of the patch (CC) that introduced this
bug it was suggested to revert that patch.

This reverts commit ea3e2e72.

Signed-off by: Neerav Parikh <Neerav.Parikh@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent fe5e3f1a

drivers/scsi/libfc/fc_exch.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -666,13 +666,10 @@ static void fc_exch_timeout(struct work_struct *work)
		if (e_stat & ESB_ST_ABNORMAL)
		rc = fc_exch_done_locked(ep);
		spin_unlock_bh(&ep->ex_lock);
		if (!rc)
		fc_exch_delete(ep);
		if (resp)
		resp(sp, ERR_PTR(-FC_EX_TIMEOUT), arg);
		if (!rc) {
		/* delete the exchange if it's already being aborted */
		fc_exch_delete(ep);
		return;
		}
		fc_seq_exch_abort(sp, 2 * ep->r_a_tov);
		goto done;
		}

Admin message