Author: mav
Date: Sat Apr 27 12:39:28 2013
New Revision: 249980
URL: http://svnweb.freebsd.org/changeset/base/249980
Log:
MFprojects/camlock r249541:
Give periph validity flag own periph reference. That slightly simplifies
the release logic and covers hypothetical case if lock is dropped inside
the periph_oninval() method.
Modified:
head/sys/cam/cam_periph.c
Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c Sat Apr 27 11:55:23 2013 (r249979)
+++ head/sys/cam/cam_periph.c Sat Apr 27 12:39:28 2013 (r249980)
@@ -203,7 +203,7 @@ cam_periph_alloc(periph_ctor_t *periph_c
periph->type = type;
periph->periph_name = name;
periph->immediate_priority = CAM_PRIORITY_NONE;
- periph->refcount = 0;
+ periph->refcount = 1; /* Dropped by invalidation. */
periph->sim = sim;
SLIST_INIT(&periph->ccb_list);
status = xpt_create_path(&path, periph, path_id, target_id, lun_id);
@@ -381,10 +381,8 @@ cam_periph_release_locked_buses(struct c
mtx_assert(periph->sim->mtx, MA_OWNED);
KASSERT(periph->refcount >= 1, ("periph->refcount >= 1"));
- if (--periph->refcount == 0
- && (periph->flags & CAM_PERIPH_INVALID)) {
+ if (--periph->refcount == 0)
camperiphfree(periph);
- }
}
void
@@ -579,23 +577,20 @@ void
cam_periph_invalidate(struct cam_periph *periph)
{
- CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
mtx_assert(periph->sim->mtx, MA_OWNED);
/*
* We only call this routine the first time a peripheral is
* invalidated.
*/
- if (((periph->flags & CAM_PERIPH_INVALID) == 0)
- && (periph->periph_oninval != NULL))
- periph->periph_oninval(periph);
+ if ((periph->flags & CAM_PERIPH_INVALID) != 0)
+ return;
+ CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
periph->flags |= CAM_PERIPH_INVALID;
periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND;
-
- xpt_lock_buses();
- if (periph->refcount == 0)
- camperiphfree(periph);
- xpt_unlock_buses();
+ if (periph->periph_oninval != NULL)
+ periph->periph_oninval(periph);
+ cam_periph_release_locked(periph);
}
static void
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
