| g_gate.c (267992) | g_gate.c (283291) |
|---|---|
| 1/*- 2 * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * Copyright (c) 2009-2010 The FreeBSD Foundation 4 * All rights reserved. 5 * 6 * Portions of this software were developed by Pawel Jakub Dawidek 7 * under sponsorship from the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@FreeBSD.org> 3 * Copyright (c) 2009-2010 The FreeBSD Foundation 4 * All rights reserved. 5 * 6 * Portions of this software were developed by Pawel Jakub Dawidek 7 * under sponsorship from the FreeBSD Foundation. 8 * --- 15 unchanged lines hidden (view full) --- 24 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * SUCH DAMAGE. 29 */ 30 31#include <sys/cdefs.h> |
| 32__FBSDID("$FreeBSD: head/sys/geom/gate/g_gate.c 267992 2014-06-28 03:56:17Z hselasky $"); | 32__FBSDID("$FreeBSD: head/sys/geom/gate/g_gate.c 283291 2015-05-22 17:05:21Z jkim $"); |
| 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bio.h> 37#include <sys/conf.h> 38#include <sys/kernel.h> 39#include <sys/kthread.h> 40#include <sys/fcntl.h> --- 440 unchanged lines hidden (view full) --- 481 bioq_init(&sc->sc_inqueue); 482 bioq_init(&sc->sc_outqueue); 483 mtx_init(&sc->sc_queue_mtx, "gg:queue", NULL, MTX_DEF); 484 sc->sc_queue_count = 0; 485 sc->sc_queue_size = ggio->gctl_maxcount; 486 if (sc->sc_queue_size > G_GATE_MAX_QUEUE_SIZE) 487 sc->sc_queue_size = G_GATE_MAX_QUEUE_SIZE; 488 sc->sc_timeout = ggio->gctl_timeout; | 33 34#include <sys/param.h> 35#include <sys/systm.h> 36#include <sys/bio.h> 37#include <sys/conf.h> 38#include <sys/kernel.h> 39#include <sys/kthread.h> 40#include <sys/fcntl.h> --- 440 unchanged lines hidden (view full) --- 481 bioq_init(&sc->sc_inqueue); 482 bioq_init(&sc->sc_outqueue); 483 mtx_init(&sc->sc_queue_mtx, "gg:queue", NULL, MTX_DEF); 484 sc->sc_queue_count = 0; 485 sc->sc_queue_size = ggio->gctl_maxcount; 486 if (sc->sc_queue_size > G_GATE_MAX_QUEUE_SIZE) 487 sc->sc_queue_size = G_GATE_MAX_QUEUE_SIZE; 488 sc->sc_timeout = ggio->gctl_timeout; |
| 489 callout_init(&sc->sc_callout, CALLOUT_MPSAFE); | 489 callout_init(&sc->sc_callout, 1); |
| 490 491 mtx_lock(&g_gate_units_lock); 492 sc->sc_unit = g_gate_getunit(ggio->gctl_unit, &error); 493 if (sc->sc_unit < 0) 494 goto fail1; 495 if (ggio->gctl_unit == G_GATE_NAME_GIVEN) 496 snprintf(name, sizeof(name), "%s", ggio->gctl_name); 497 else { --- 468 unchanged lines hidden --- | 490 491 mtx_lock(&g_gate_units_lock); 492 sc->sc_unit = g_gate_getunit(ggio->gctl_unit, &error); 493 if (sc->sc_unit < 0) 494 goto fail1; 495 if (ggio->gctl_unit == G_GATE_NAME_GIVEN) 496 snprintf(name, sizeof(name), "%s", ggio->gctl_name); 497 else { --- 468 unchanged lines hidden --- |