svn commit: r298613 - head/sys/dev/hyperv/storvsc

[Sepherosa Ziehau]

Author: sephe
Date: Tue Apr 26 04:48:57 2016
New Revision: 298613
URL: https://svnweb.freebsd.org/changeset/base/298613

Log:
  hyperv/stor: Remove the useless hs_open_multi_channel
  
  This fixes the sub-channel offer race after Hyper-V device probe/attach
  is moved to vmbus SYSINIT/attach.
  
  MFC after:	1 week
  Sponsored by:	Microsoft OSTC

Modified:
  head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c

Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Tue Apr 26 04:40:59 2016	(r298612)
+++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c	Tue Apr 26 04:48:57 2016	(r298613)
@@ -140,7 +140,6 @@ struct storvsc_softc {
 	uint32_t			hs_num_out_reqs;
 	boolean_t			hs_destroy;
 	boolean_t			hs_drain_notify;
-	boolean_t			hs_open_multi_channel;
 	struct sema 			hs_drain_sema;	
 	struct hv_storvsc_request	hs_init_req;
 	struct hv_storvsc_request	hs_reset_req;
@@ -336,9 +335,6 @@ storvsc_handle_sc_creation(void *context
 	if (sc == NULL)
 		return;
 
-	if (FALSE == sc->hs_open_multi_channel)
-		return;
-	
 	memset(&props, 0, sizeof(props));
 
 	ret = hv_vmbus_channel_open(new_channel,
@@ -417,8 +413,6 @@ storvsc_send_multichannel_request(struct
 		return;
 	}
 
-	sc->hs_open_multi_channel = TRUE;
-
 	if (bootverbose)
 		printf("Storvsc create multi-channel success!\n");
 }
@@ -1034,7 +1028,6 @@ storvsc_attach(device_t dev)
 
 	sc->hs_destroy = FALSE;
 	sc->hs_drain_notify = FALSE;
-	sc->hs_open_multi_channel = FALSE;
 	sema_init(&sc->hs_drain_sema, 0, "Store Drain Sema");
 
 	ret = hv_storvsc_connect_vsp(hv_dev);