From owner-svn-src-projects@FreeBSD.ORG  Thu Aug 15 12:55:58 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 0CB039B;
 Thu, 15 Aug 2013 12:55:58 +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 ED7312E20;
 Thu, 15 Aug 2013 12:55:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7FCtvb7026845;
 Thu, 15 Aug 2013 12:55:57 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7FCtvFM026844;
 Thu, 15 Aug 2013 12:55:57 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201308151255.r7FCtvFM026844@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 15 Aug 2013 12:55:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254365 - projects/camlock/sys/cam/scsi
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, 15 Aug 2013 12:55:58 -0000

Author: mav
Date: Thu Aug 15 12:55:57 2013
New Revision: 254365
URL: http://svnweb.freebsd.org/changeset/base/254365

Log:
  Remove check for zero sized BIOs. I don't remember why have I added it,
  but if such BIOs exist, they probably could be completed at GEOM layer.

Modified:
  projects/camlock/sys/cam/scsi/scsi_da.c

Modified: projects/camlock/sys/cam/scsi/scsi_da.c
==============================================================================
--- projects/camlock/sys/cam/scsi/scsi_da.c	Thu Aug 15 12:19:16 2013	(r254364)
+++ projects/camlock/sys/cam/scsi/scsi_da.c	Thu Aug 15 12:55:57 2013	(r254365)
@@ -1349,9 +1349,7 @@ dastrategy(struct bio *bp)
 	 * Place it in the queue of disk activities for this disk
 	 */
 	if (bp->bio_cmd == BIO_DELETE) {
-		if (bp->bio_bcount == 0)
-			biodone(bp);
-		else if (DA_SIO)
+		if (DA_SIO)
 			bioq_disksort(&softc->delete_queue, bp);
 		else
 			bioq_insert_tail(&softc->delete_queue, bp);