From owner-svn-src-stable@FreeBSD.ORG  Tue Jun 18 09:42:43 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 9087C80D;
 Tue, 18 Jun 2013 09:42:43 +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 830091BC6;
 Tue, 18 Jun 2013 09:42:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I9ghK1090699;
 Tue, 18 Jun 2013 09:42:43 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I9ghZM090698;
 Tue, 18 Jun 2013 09:42:43 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306180942.r5I9ghZM090698@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 18 Jun 2013 09:42:43 +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: r251927 - 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:42:43 -0000

Author: mav
Date: Tue Jun 18 09:42:43 2013
New Revision: 251927
URL: http://svnweb.freebsd.org/changeset/base/251927

Log:
  MFC r249193 (by trasz):
  Make it possible to submit FLUSH bios through geom_dev strategy.  This
  is required for CTL to work with device-backed LUNs.

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

Modified: stable/9/sys/geom/geom_dev.c
==============================================================================
--- stable/9/sys/geom/geom_dev.c	Tue Jun 18 09:41:34 2013	(r251926)
+++ stable/9/sys/geom/geom_dev.c	Tue Jun 18 09:42:43 2013	(r251927)
@@ -522,7 +522,8 @@ g_dev_strategy(struct bio *bp)
 
 	KASSERT(bp->bio_cmd == BIO_READ ||
 	        bp->bio_cmd == BIO_WRITE ||
-	        bp->bio_cmd == BIO_DELETE,
+	        bp->bio_cmd == BIO_DELETE ||
+		bp->bio_cmd == BIO_FLUSH,
 		("Wrong bio_cmd bio=%p cmd=%d", bp, bp->bio_cmd));
 	dev = bp->bio_dev;
 	cp = dev->si_drv2;