View | Details | Raw Unified | Return to bug 197309 | Differences between
and this patch

Collapse All | Expand All

(-)sys/geom/gate/g_gate.c (-1 / +5 lines)
Lines 438-444 Link Here
438
{
438
{
439
	struct g_gate_softc *sc;
439
	struct g_gate_softc *sc;
440
	struct g_geom *gp;
440
	struct g_geom *gp;
441
	struct g_provider *pp, *ropp;
441
	struct g_provider *pp, *ropp = NULL;
442
	struct g_consumer *cp;
442
	struct g_consumer *cp;
443
	char name[NAME_MAX];
443
	char name[NAME_MAX];
444
	int error = 0, unit;
444
	int error = 0, unit;
Lines 516-521 Link Here
516
516
517
	g_topology_lock();
517
	g_topology_lock();
518
518
519
#if 0
519
	if (ggio->gctl_readprov[0] == '\0') {
520
	if (ggio->gctl_readprov[0] == '\0') {
520
		ropp = NULL;
521
		ropp = NULL;
521
	} else {
522
	} else {
Lines 538-543 Link Here
538
			goto fail2;
539
			goto fail2;
539
		}
540
		}
540
	}
541
	}
542
#endif
541
543
542
	gp = g_new_geomf(&g_gate_class, "%s", name);
544
	gp = g_new_geomf(&g_gate_class, "%s", name);
543
	gp->start = g_gate_start;
545
	gp->start = g_gate_start;
Lines 587-593 Link Here
587
fail3:
589
fail3:
588
	g_destroy_consumer(cp);
590
	g_destroy_consumer(cp);
589
	g_destroy_geom(gp);
591
	g_destroy_geom(gp);
592
#if 0
590
fail2:
593
fail2:
594
#endif
591
	g_topology_unlock();
595
	g_topology_unlock();
592
	mtx_lock(&g_gate_units_lock);
596
	mtx_lock(&g_gate_units_lock);
593
	g_gate_units[sc->sc_unit] = NULL;
597
	g_gate_units[sc->sc_unit] = NULL;

Return to bug 197309