From owner-svn-src-head@FreeBSD.ORG  Thu Jun 13 08:34:23 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ED42DCD6;
 Thu, 13 Jun 2013 08:34:23 +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 E057F1F96;
 Thu, 13 Jun 2013 08:34:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5D8YNv4068965;
 Thu, 13 Jun 2013 08:34:23 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5D8YNoP068963;
 Thu, 13 Jun 2013 08:34:23 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201306130834.r5D8YNoP068963@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 13 Jun 2013 08:34:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251683 - in head/sys/cam: ata scsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 08:34:24 -0000

Author: mav
Date: Thu Jun 13 08:34:23 2013
New Revision: 251683
URL: http://svnweb.freebsd.org/changeset/base/251683

Log:
  Revert r251649:
  ken@ noticed that with recently added d_gone() disk method GEOM already
  holds reference on the periph, so we don't need another one.

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Thu Jun 13 08:07:42 2013	(r251682)
+++ head/sys/cam/ata/ata_da.c	Thu Jun 13 08:34:23 2013	(r251683)
@@ -1080,13 +1080,10 @@ adagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
-	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
-		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
-	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu Jun 13 08:07:42 2013	(r251682)
+++ head/sys/cam/scsi/scsi_da.c	Thu Jun 13 08:34:23 2013	(r251683)
@@ -1427,13 +1427,10 @@ dagetattr(struct bio *bp)
 	struct cam_periph *periph;
 
 	periph = (struct cam_periph *)bp->bio_disk->d_drv1;
-	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
-		return (ENXIO);
 	cam_periph_lock(periph);
 	ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
 	    periph->path);
 	cam_periph_unlock(periph);
-	cam_periph_release(periph);
 	if (ret == 0)
 		bp->bio_completed = bp->bio_length;
 	return ret;