From owner-svn-src-head@FreeBSD.ORG Wed Jun 12 09:07:16 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2D02070; Wed, 12 Jun 2013 09:07:16 +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 1F9061AFA; Wed, 12 Jun 2013 09:07:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C97GG2022050; Wed, 12 Jun 2013 09:07:16 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C97FTN022047; Wed, 12 Jun 2013 09:07:15 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201306120907.r5C97FTN022047@svn.freebsd.org> From: Alexander Motin Date: Wed, 12 Jun 2013 09:07:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251649 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jun 2013 09:07:16 -0000 Author: mav Date: Wed Jun 12 09:07:15 2013 New Revision: 251649 URL: http://svnweb.freebsd.org/changeset/base/251649 Log: Acquire periph reference when handling d_getattr() method call. While GEOM in general has provider opened while sending BIO_GETATTR, GEOM DISK does not really need to open disk to read medium-unrelated attributes for own use. Proposed by: ken 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 Wed Jun 12 07:53:59 2013 (r251648) +++ head/sys/cam/ata/ata_da.c Wed Jun 12 09:07:15 2013 (r251649) @@ -1080,10 +1080,13 @@ 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 Wed Jun 12 07:53:59 2013 (r251648) +++ head/sys/cam/scsi/scsi_da.c Wed Jun 12 09:07:15 2013 (r251649) @@ -1427,10 +1427,13 @@ 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;