Date: Fri, 12 Jul 2013 21:36:29 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253288 - head/sys/dev/hptnr Message-ID: <201307122136.r6CLaT2D056937@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Fri Jul 12 21:36:29 2013 New Revision: 253288 URL: http://svnweb.freebsd.org/changeset/base/253288 Log: Merge from hpt27xx, r249468 (mav): MFprojects/camlock r248982: Stop abusing xpt_periph in random plases that really have no periph related to CCB, for example, bus scanning. NULL value is fine in such cases and it is correctly logged in debug messages as "noperiph". If at some point we need some real XPT periphs (alike to pmpX now), quite likely they will be per-bus, and not a single global instance as xpt_periph now. Modified: head/sys/dev/hptnr/hptnr_osm_bsd.c Modified: head/sys/dev/hptnr/hptnr_osm_bsd.c ============================================================================== --- head/sys/dev/hptnr/hptnr_osm_bsd.c Fri Jul 12 21:27:23 2013 (r253287) +++ head/sys/dev/hptnr/hptnr_osm_bsd.c Fri Jul 12 21:36:29 2013 (r253288) @@ -1347,7 +1347,7 @@ static int hpt_rescan_bus(void) { return(ENOMEM); } - if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(vbus_ext->sim), + if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { xpt_free_ccb(ccb);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307122136.r6CLaT2D056937>