mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-18 15:30:21 +00:00
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.
This commit is contained in:
parent
8d992fa5ee
commit
967206bde7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=251683
@ -1080,13 +1080,10 @@ adagetattr(struct bio *bp)
|
|||||||
struct cam_periph *periph;
|
struct cam_periph *periph;
|
||||||
|
|
||||||
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
||||||
if (cam_periph_acquire(periph) != CAM_REQ_CMP)
|
|
||||||
return (ENXIO);
|
|
||||||
cam_periph_lock(periph);
|
cam_periph_lock(periph);
|
||||||
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
||||||
periph->path);
|
periph->path);
|
||||||
cam_periph_unlock(periph);
|
cam_periph_unlock(periph);
|
||||||
cam_periph_release(periph);
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
bp->bio_completed = bp->bio_length;
|
bp->bio_completed = bp->bio_length;
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1427,13 +1427,10 @@ dagetattr(struct bio *bp)
|
|||||||
struct cam_periph *periph;
|
struct cam_periph *periph;
|
||||||
|
|
||||||
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
||||||
if (cam_periph_acquire(periph) != CAM_REQ_CMP)
|
|
||||||
return (ENXIO);
|
|
||||||
cam_periph_lock(periph);
|
cam_periph_lock(periph);
|
||||||
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
||||||
periph->path);
|
periph->path);
|
||||||
cam_periph_unlock(periph);
|
cam_periph_unlock(periph);
|
||||||
cam_periph_release(periph);
|
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
bp->bio_completed = bp->bio_length;
|
bp->bio_completed = bp->bio_length;
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
Reference in New Issue
Block a user