svn commit: r241510 - head/sys/cam
Alexander Motin
mav at FreeBSD.org
Sat Oct 13 18:24:53 UTC 2012
Author: mav
Date: Sat Oct 13 18:24:52 2012
New Revision: 241510
URL: http://svn.freebsd.org/changeset/base/241510
Log:
Don't exclude XPT SIM from locking in xpt_create_path_unlocked().
We don't want xpt periph, device, target or bus disappeared because of
incorrect reference counting.
Modified:
head/sys/cam/cam_xpt.c
Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c Sat Oct 13 18:11:50 2012 (r241509)
+++ head/sys/cam/cam_xpt.c Sat Oct 13 18:24:52 2012 (r241510)
@@ -3441,19 +3441,14 @@ xpt_create_path_unlocked(struct cam_path
struct cam_path *path;
struct cam_eb *bus = NULL;
cam_status status;
- int need_unlock = 0;
path = (struct cam_path *)malloc(sizeof(*path), M_CAMPATH, M_WAITOK);
- if (path_id != CAM_BUS_WILDCARD) {
- bus = xpt_find_bus(path_id);
- if (bus != NULL) {
- need_unlock = 1;
- CAM_SIM_LOCK(bus->sim);
- }
- }
+ bus = xpt_find_bus(path_id);
+ if (bus != NULL)
+ CAM_SIM_LOCK(bus->sim);
status = xpt_compile_path(path, periph, path_id, target_id, lun_id);
- if (need_unlock) {
+ if (bus != NULL) {
CAM_SIM_UNLOCK(bus->sim);
xpt_release_bus(bus);
}
More information about the svn-src-all
mailing list