diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1999-05-18 00:41:05 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1999-05-18 00:41:05 +0000 |
| commit | 804540113fe7cc078437b8ec2621d99ca2f7d0b9 (patch) | |
| tree | f39489d30f21f84a959f4e185889c6ba369a015f /sys/cam/cam_xpt.c | |
| parent | f24c2153d56ecc6eb99327f2c96ed3e7c271b63d (diff) | |
| download | src-804540113fe7cc078437b8ec2621d99ca2f7d0b9.tar.gz src-804540113fe7cc078437b8ec2621d99ca2f7d0b9.zip | |
Make xpt_path_comp work on wildcarded paths again.
Notes
Notes:
svn path=/head/; revision=47282
Diffstat (limited to 'sys/cam/cam_xpt.c')
| -rw-r--r-- | sys/cam/cam_xpt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 6bf427e659c7..4f277247d855 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cam_xpt.c,v 1.56 1999/05/11 02:41:00 mjacob Exp $ + * $Id: cam_xpt.c,v 1.57 1999/05/11 15:44:39 mjacob Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -3778,22 +3778,22 @@ xpt_path_comp(struct cam_path *path1, struct cam_path *path2) int retval = 0; if (path1->bus != path2->bus) { - if ((path1->bus == NULL) - || (path2->bus == NULL)) + if (path1->bus->path_id == CAM_BUS_WILDCARD + || path2->bus->path_id == CAM_BUS_WILDCARD) retval = 1; else return (-1); } if (path1->target != path2->target) { - if ((path1->target == NULL) - || (path2->target == NULL)) + if (path1->target->target_id == CAM_TARGET_WILDCARD + || path2->target->target_id == CAM_TARGET_WILDCARD) retval = 1; else return (-1); } if (path1->device != path2->device) { - if ((path1->device == NULL) - || (path2->device == NULL)) + if (path1->device->lun_id == CAM_LUN_WILDCARD + || path2->device->lun_id == CAM_LUN_WILDCARD) retval = 1; else return (-1); |