From 65a8a0b34e0906278979176b47eb7976c5a3900a Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 2 Oct 2012 11:03:31 -0700 Subject: [PATCH] --- yaml --- r: 334144 b: refs/heads/master c: 5c1b10ab7f93d24f29b5630286e323d1c5802d5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/storvsc_drv.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e9c3f5789bec..517109dc9558 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f24b5cb818c6789e5d42d4881f34238a5fa0b40c +refs/heads/master: 5c1b10ab7f93d24f29b5630286e323d1c5802d5c diff --git a/trunk/drivers/scsi/storvsc_drv.c b/trunk/drivers/scsi/storvsc_drv.c index 528d52beaa1c..01440782feb2 100644 --- a/trunk/drivers/scsi/storvsc_drv.c +++ b/trunk/drivers/scsi/storvsc_drv.c @@ -1221,7 +1221,12 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) /* * At this point, all outstanding requests in the adapter * should have been flushed out and return to us + * There is a potential race here where the host may be in + * the process of responding when we return from here. + * Just wait for all in-transit packets to be accounted for + * before we return from here. */ + storvsc_wait_to_drain(stor_device); return SUCCESS; }