diff options
| author | mav <mav@FreeBSD.org> | 2013-06-13 08:34:23 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2013-06-13 08:34:23 +0000 |
| commit | f27494cb46386a6b3770bda7a80ab76fbda3ae85 (patch) | |
| tree | 34aab29495707c7890414518eb687c9c6e96458e /sys/cam | |
| parent | 8227052b246cb2e0c78edacb11990a9f9bde9320 (diff) | |
| download | FreeBSD-src-f27494cb46386a6b3770bda7a80ab76fbda3ae85.zip FreeBSD-src-f27494cb46386a6b3770bda7a80ab76fbda3ae85.tar.gz | |
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.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ata/ata_da.c | 3 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_da.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index e6ae5b2..0a4d4a3 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 bbbb0e1..76a16ea 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; |
