From 967206bde725efa20ad56eeab0bc85d218f9dce1 Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Thu, 13 Jun 2013 08:34:23 +0000 Subject: [PATCH] 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. --- sys/cam/ata/ata_da.c | 3 --- sys/cam/scsi/scsi_da.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index e6ae5b21ff22..0a4d4a3789f6 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -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; diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index bbbb0e128f56..76a16ea599d8 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -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;