From owner-svn-src-projects@FreeBSD.ORG  Thu Sep  5 21:03:27 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A6CDA2C0;
 Thu,  5 Sep 2013 21:03:27 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 936F02071;
 Thu,  5 Sep 2013 21:03:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85L3RPY007893;
 Thu, 5 Sep 2013 21:03:27 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85L3Rbq007892;
 Thu, 5 Sep 2013 21:03:27 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201309052103.r85L3Rbq007892@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 5 Sep 2013 21:03:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r255266 - projects/camlock/sys/geom
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Sep 2013 21:03:27 -0000

Author: mav
Date: Thu Sep  5 21:03:27 2013
New Revision: 255266
URL: http://svnweb.freebsd.org/changeset/base/255266

Log:
  Fix double completion for zero length requests.

Modified:
  projects/camlock/sys/geom/geom_io.c

Modified: projects/camlock/sys/geom/geom_io.c
==============================================================================
--- projects/camlock/sys/geom/geom_io.c	Thu Sep  5 20:50:52 2013	(r255265)
+++ projects/camlock/sys/geom/geom_io.c	Thu Sep  5 21:03:27 2013	(r255266)
@@ -380,7 +380,6 @@ g_io_check(struct bio *bp)
 
 		/* Deliver zero length transfers right here. */
 		if (bp->bio_length == 0) {
-			g_io_deliver(bp, 0);
 			CTR2(KTR_GEOM, "g_down terminated 0-length "
 			    "bp %p provider %s", bp, bp->bio_to->name);
 			return (0);