From owner-svn-src-all@freebsd.org Wed Oct 4 12:25:41 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14F81E38B17; Wed, 4 Oct 2017 12:25:41 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3323BE5; Wed, 4 Oct 2017 12:25:40 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v94CPd3X025034; Wed, 4 Oct 2017 12:25:39 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v94CPdgx025032; Wed, 4 Oct 2017 12:25:39 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710041225.v94CPdgx025032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 4 Oct 2017 12:25:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324276 - head/sys/geom/mountver X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/geom/mountver X-SVN-Commit-Revision: 324276 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Oct 2017 12:25:41 -0000 Author: trasz Date: Wed Oct 4 12:25:39 2017 New Revision: 324276 URL: https://svnweb.freebsd.org/changeset/base/324276 Log: Don't destroy gmountver(8) devices on shutdown, unless they are orphaned. Otherwise we would fail to sync the filesystem on reboot. MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/sys/geom/mountver/g_mountver.c head/sys/geom/mountver/g_mountver.h Modified: head/sys/geom/mountver/g_mountver.c ============================================================================== --- head/sys/geom/mountver/g_mountver.c Wed Oct 4 12:23:34 2017 (r324275) +++ head/sys/geom/mountver/g_mountver.c Wed Oct 4 12:25:39 2017 (r324276) @@ -190,6 +190,11 @@ g_mountver_start(struct bio *bp) * requests in order to maintain ordering. */ if (sc->sc_orphaned || !TAILQ_EMPTY(&sc->sc_queue)) { + if (sc->sc_shutting_down) { + G_MOUNTVER_LOGREQ(bp, "Discarding request due to shutdown."); + g_io_deliver(bp, ENXIO); + return; + } G_MOUNTVER_LOGREQ(bp, "Queueing request."); g_mountver_queue(bp); if (!sc->sc_orphaned) @@ -607,13 +612,20 @@ g_mountver_dumpconf(struct sbuf *sb, const char *inden static void g_mountver_shutdown_pre_sync(void *arg, int howto) { + struct g_mountver_softc *sc; struct g_class *mp; struct g_geom *gp, *gp2; mp = arg; g_topology_lock(); - LIST_FOREACH_SAFE(gp, &mp->geom, geom, gp2) - g_mountver_destroy(gp, 1); + LIST_FOREACH_SAFE(gp, &mp->geom, geom, gp2) { + if (gp->softc == NULL) + continue; + sc = gp->softc; + sc->sc_shutting_down = 1; + if (sc->sc_orphaned) + g_mountver_destroy(gp, 1); + } g_topology_unlock(); } Modified: head/sys/geom/mountver/g_mountver.h ============================================================================== --- head/sys/geom/mountver/g_mountver.h Wed Oct 4 12:23:34 2017 (r324275) +++ head/sys/geom/mountver/g_mountver.h Wed Oct 4 12:25:39 2017 (r324276) @@ -62,6 +62,7 @@ struct g_mountver_softc { char *sc_provider_name; char sc_ident[DISK_IDENT_SIZE]; int sc_orphaned; + int sc_shutting_down; int sc_access_r; int sc_access_w; int sc_access_e;