From owner-svn-src-all@FreeBSD.ORG Thu Jan 7 09:21:14 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0C74D1065672;
Thu, 7 Jan 2010 09:21:14 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id EF50F8FC0A;
Thu, 7 Jan 2010 09:21:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o079LDm2005455;
Thu, 7 Jan 2010 09:21:13 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o079LDF2005453;
Thu, 7 Jan 2010 09:21:13 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201001070921.o079LDF2005453@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 7 Jan 2010 09:21:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r201721 - stable/7/sys/cam/scsi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 07 Jan 2010 09:21:14 -0000
Author: mav
Date: Thu Jan 7 09:21:13 2010
New Revision: 201721
URL: http://svn.freebsd.org/changeset/base/201721
Log:
MFC r200668:
Remove duplicate devstat_start_transaction_bio() call. It is already called
from geom_disk. Dulicate call causes wrong queue depth and busy accounting.
Modified:
stable/7/sys/cam/scsi/scsi_cd.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/7/sys/cam/scsi/scsi_cd.c Thu Jan 7 09:07:51 2010 (r201720)
+++ stable/7/sys/cam/scsi/scsi_cd.c Thu Jan 7 09:21:13 2010 (r201721)
@@ -1454,8 +1454,6 @@ cdstart(struct cam_periph *periph, union
} else {
bioq_remove(&softc->bio_queue, bp);
- devstat_start_transaction_bio(softc->disk->d_devstat, bp);
-
scsi_read_write(&start_ccb->csio,
/*retries*/cd_retry_count,
/* cbfcnp */ cddone,