From owner-svn-src-stable@FreeBSD.ORG  Tue Jun 18 09:39:53 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 679234DB;
 Tue, 18 Jun 2013 09:39:53 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5A18A1B9F;
 Tue, 18 Jun 2013 09:39:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I9drww088399;
 Tue, 18 Jun 2013 09:39:53 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I9drRN088398;
 Tue, 18 Jun 2013 09:39:53 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306180939.r5I9drRN088398@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 18 Jun 2013 09:39:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r251925 - stable/9/sys/geom
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jun 2013 09:39:53 -0000

Author: mav
Date: Tue Jun 18 09:39:52 2013
New Revision: 251925
URL: http://svnweb.freebsd.org/changeset/base/251925

Log:
  MFC r248722:
  geom_slice.c and its consumers like GEOM_LABEL are not touching the data
  unless hotspots are used.  Pass G_PF_ACCEPT_UNMAPPED flag through except
  such rare cases (obsolete GEOM_SUNLABEL and GEOM_BSD).

Modified:
  stable/9/sys/geom/geom_slice.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/geom_slice.c
==============================================================================
--- stable/9/sys/geom/geom_slice.c	Tue Jun 18 09:37:44 2013	(r251924)
+++ stable/9/sys/geom/geom_slice.c	Tue Jun 18 09:39:52 2013	(r251925)
@@ -397,6 +397,8 @@ g_slice_config(struct g_geom *gp, u_int 
 	pp->stripeoffset = pp2->stripeoffset + offset;
 	if (pp->stripesize > 0)
 		pp->stripeoffset %= pp->stripesize;
+	if (gsp->nhotspot == 0)
+		pp->flags |= pp2->flags & G_PF_ACCEPT_UNMAPPED;
 	if (0 && bootverbose)
 		printf("GEOM: Configure %s, start %jd length %jd end %jd\n",
 		    pp->name, (intmax_t)offset, (intmax_t)length,
@@ -429,11 +431,17 @@ g_slice_conf_hot(struct g_geom *gp, u_in
 {
 	struct g_slicer *gsp;
 	struct g_slice_hot *gsl, *gsl2;
+	struct g_provider *pp;
 
 	g_trace(G_T_TOPOLOGY, "g_slice_conf_hot(%s, idx: %d, off: %jd, len: %jd)",
 	    gp->name, idx, (intmax_t)offset, (intmax_t)length);
 	g_topology_assert();
 	gsp = gp->softc;
+	/* Deny unmapped I/O if hotspots are used. */
+	if (gsp->nhotspot == 0) {
+		LIST_FOREACH(pp, &gp->provider, provider)
+			pp->flags &= ~G_PF_ACCEPT_UNMAPPED;
+	}
 	gsl = gsp->hotspot;
 	if(idx >= gsp->nhotspot) {
 		gsl2 = g_malloc((idx + 1) * sizeof *gsl2, M_WAITOK | M_ZERO);