From owner-svn-src-all@FreeBSD.ORG  Fri Apr  5 10:57:03 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 821FB3C9;
 Fri,  5 Apr 2013 10:57:03 +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 74926EC6;
 Fri,  5 Apr 2013 10:57:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r35Av3j2048285;
 Fri, 5 Apr 2013 10:57:03 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r35Av3oS048284;
 Fri, 5 Apr 2013 10:57:03 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304051057.r35Av3oS048284@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 5 Apr 2013 10:57:03 +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: r249150 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Apr 2013 10:57:03 -0000

Author: mav
Date: Fri Apr  5 10:57:02 2013
New Revision: 249150
URL: http://svnweb.freebsd.org/changeset/base/249150

Log:
  MFC r244716 (by pjd):
  Reset provider-specific fields when resending I/O request in low memory
  conditions. This fixes assertion which checks those fields when kernel is
  compiled with DIAGNOSTIC.

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

Modified: stable/9/sys/geom/geom_io.c
==============================================================================
--- stable/9/sys/geom/geom_io.c	Fri Apr  5 10:50:32 2013	(r249149)
+++ stable/9/sys/geom/geom_io.c	Fri Apr  5 10:57:02 2013	(r249150)
@@ -565,6 +565,9 @@ g_io_deliver(struct bio *bp, int error)
 		printf("ENOMEM %p on %p(%s)\n", bp, pp, pp->name);
 	bp->bio_children = 0;
 	bp->bio_inbed = 0;
+	bp->bio_driver1 = NULL;
+	bp->bio_driver2 = NULL;
+	bp->bio_pflags = 0;
 	g_io_request(bp, cp);
 	pace++;
 	return;