Make xpt_path_comp work on wildcarded paths again.

This commit is contained in:
gibbs 1999-05-18 00:41:05 +00:00
parent a83bfbcb2f
commit 2fde75e5f6

View File

@ -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);