Date: Mon, 2 Jan 2012 19:23:52 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r229308 - in stable/8/sys: conf geom/multipath Message-ID: <201201021923.q02JNqMC082121@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Jan 2 19:23:52 2012 New Revision: 229308 URL: http://svn.freebsd.org/changeset/base/229308 Log: Forcefully reMFC r208082, r208101 (mjacob) MFCed at r207126 and r209278 and for some reason reverted at r209279 without reverting metadatata. Modified: stable/8/sys/geom/multipath/g_multipath.c Directory Properties: stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed) stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed) Modified: stable/8/sys/geom/multipath/g_multipath.c ============================================================================== --- stable/8/sys/geom/multipath/g_multipath.c Mon Jan 2 18:59:55 2012 (r229307) +++ stable/8/sys/geom/multipath/g_multipath.c Mon Jan 2 19:23:52 2012 (r229308) @@ -197,7 +197,7 @@ g_multipath_done_error(struct bio *bp) break; } } - if (sc->cp_active == NULL) { + if (sc->cp_active == NULL || sc->cp_active->provider == NULL) { printf("GEOM_MULTIPATH: out of providers for %s\n", sc->sc_name); g_topology_unlock(); @@ -743,7 +743,7 @@ g_multipath_ctl_getactive(struct gctl_re return; } sc = gp->softc; - if (sc->cp_active) { + if (sc->cp_active && sc->cp_active->provider) { sbuf_printf(sb, "%s\n", sc->cp_active->provider->name); } else { sbuf_printf(sb, "none\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201021923.q02JNqMC082121>