svn commit: r251683 - in head/sys/cam: ata scsi

[Alexander Motin]

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;