diff options
| author | trasz <trasz@FreeBSD.org> | 2008-12-17 10:49:03 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2008-12-17 10:49:03 +0000 |
| commit | baed8aaae54e47b5ef994a307febc994595b0e50 (patch) | |
| tree | add6f77bf4268f51f0c1d29280a3956466d5fb4b /sys/cam/cam_periph.c | |
| parent | 3d8066935651e8c54e600a1b763b99b916115e44 (diff) | |
| download | FreeBSD-src-baed8aaae54e47b5ef994a307febc994595b0e50.zip FreeBSD-src-baed8aaae54e47b5ef994a307febc994595b0e50.tar.gz | |
Revert r186186 for now; it breaks stuff.
Approved by: rwatson (mentor)
Diffstat (limited to 'sys/cam/cam_periph.c')
| -rw-r--r-- | sys/cam/cam_periph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 907c801..26fbc6e 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -311,6 +311,8 @@ cam_periph_hold(struct cam_periph *periph, int priority) struct mtx *mtx; int error; + mtx_assert(periph->sim->mtx, MA_OWNED); + /* * Increment the reference count on the peripheral * while we wait for our lock attempt to succeed @@ -322,8 +324,6 @@ cam_periph_hold(struct cam_periph *periph, int priority) return (ENXIO); mtx = periph->sim->mtx; - mtx_assert(mtx, MA_OWNED); - if (mtx == &Giant) mtx = NULL; |
