| scsi_ctl.c (268683) | scsi_ctl.c (268692) |
|---|---|
| 1/*- 2 * Copyright (c) 2008, 2009 Silicon Graphics International Corp. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 22 unchanged lines hidden (view full) --- 31 */ 32/* 33 * Peripheral driver interface between CAM and CTL (CAM Target Layer). 34 * 35 * Author: Ken Merry <ken@FreeBSD.org> 36 */ 37 38#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2008, 2009 Silicon Graphics International Corp. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 22 unchanged lines hidden (view full) --- 31 */ 32/* 33 * Peripheral driver interface between CAM and CTL (CAM Target Layer). 34 * 35 * Author: Ken Merry <ken@FreeBSD.org> 36 */ 37 38#include <sys/cdefs.h> |
| 39__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/scsi_ctl.c 268683 2014-07-15 17:06:10Z mav $"); | 39__FBSDID("$FreeBSD: stable/10/sys/cam/ctl/scsi_ctl.c 268692 2014-07-15 17:14:53Z mav $"); |
| 40 41#include <sys/param.h> 42#include <sys/queue.h> 43#include <sys/systm.h> 44#include <sys/kernel.h> 45#include <sys/lock.h> 46#include <sys/mutex.h> 47#include <sys/condvar.h> --- 431 unchanged lines hidden (view full) --- 479 480 if (found == 0) { 481 printf("%s: CTL port for CAM path %u not " 482 "found!\n", __func__, 483 xpt_path_path_id(path)); 484 break; 485 } 486 if (dev_chg->arrived != 0) { | 40 41#include <sys/param.h> 42#include <sys/queue.h> 43#include <sys/systm.h> 44#include <sys/kernel.h> 45#include <sys/lock.h> 46#include <sys/mutex.h> 47#include <sys/condvar.h> --- 431 unchanged lines hidden (view full) --- 479 480 if (found == 0) { 481 printf("%s: CTL port for CAM path %u not " 482 "found!\n", __func__, 483 xpt_path_path_id(path)); 484 break; 485 } 486 if (dev_chg->arrived != 0) { |
| 487 retval = ctl_add_initiator(dev_chg->wwpn, 488 softc->port.targ_port, dev_chg->target); | 487 retval = ctl_add_initiator(&softc->port, 488 dev_chg->target, dev_chg->wwpn, NULL); |
| 489 } else { | 489 } else { |
| 490 retval = ctl_remove_initiator( 491 softc->port.targ_port, dev_chg->target); | 490 retval = ctl_remove_initiator(&softc->port, 491 dev_chg->target); |
| 492 } 493 | 492 } 493 |
| 494 if (retval != 0) { | 494 if (retval < 0) { |
| 495 printf("%s: could not %s port %d iid %u " 496 "WWPN %#jx!\n", __func__, 497 (dev_chg->arrived != 0) ? "add" : 498 "remove", softc->port.targ_port, 499 dev_chg->target, 500 (uintmax_t)dev_chg->wwpn); 501 } 502 break; --- 1703 unchanged lines hidden --- | 495 printf("%s: could not %s port %d iid %u " 496 "WWPN %#jx!\n", __func__, 497 (dev_chg->arrived != 0) ? "add" : 498 "remove", softc->port.targ_port, 499 dev_chg->target, 500 (uintmax_t)dev_chg->wwpn); 501 } 502 break; --- 1703 unchanged lines hidden --- |