From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Subject: [set4 resend PATCH 5/5] Revert "[SCSI] fix async probe regression" Date: Mon, 09 Jul 2012 19:33:45 -0700 Message-ID: <20120710023345.26249.15688.stgit@dwillia2-linux.jf.intel.com> References: <20120710023241.26249.13718.stgit@dwillia2-linux.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com ([192.55.52.93]:9704 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752855Ab2GJCQ6 (ORCPT ); Mon, 9 Jul 2012 22:16:58 -0400 In-Reply-To: <20120710023241.26249.13718.stgit@dwillia2-linux.jf.intel.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: jgarzik@pobox.com, JBottomley@parallels.com Cc: linux-ide@vger.kernel.org, Meelis Roos , Eldad Zack , linux-scsi@vger.kernel.org This reverts commit 43a8d39d0137612c336aa8bbb2cb886a79772ffb. Commit 43a8d39d fixed the fact that wait_for_device_probe() was unable to flush sd probe work. Now that sd probe work is once again flushable via wait_for_device_probe() this workaround is no longer needed. Cc: Meelis Roos Tested-by: Eldad Zack Signed-off-by: Dan Williams --- drivers/scsi/scsi_scan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index a0bc663..56a9379 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -147,7 +147,7 @@ int scsi_complete_async_scans(void) do { if (list_empty(&scanning_hosts)) - goto out; + return 0; /* If we can't get memory immediately, that's OK. Just * sleep a little. Even if we never get memory, the async * scans will finish eventually. @@ -179,11 +179,8 @@ int scsi_complete_async_scans(void) } done: spin_unlock(&async_scan_lock); - kfree(data); - - out: - async_synchronize_full_domain(&scsi_sd_probe_domain); + kfree(data); return 0; }