From owner-svn-src-all@FreeBSD.ORG Tue Jul 15 16:55:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4A19BCB0; Tue, 15 Jul 2014 16:55:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A9152B65; Tue, 15 Jul 2014 16:55:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FGtFF2076845; Tue, 15 Jul 2014 16:55:15 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FGtD58076836; Tue, 15 Jul 2014 16:55:13 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407151655.s6FGtD58076836@svn.freebsd.org> From: Alexander Motin Date: Tue, 15 Jul 2014 16:55:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268676 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2014 16:55:15 -0000 Author: mav Date: Tue Jul 15 16:55:13 2014 New Revision: 268676 URL: http://svnweb.freebsd.org/changeset/base/268676 Log: MFC r268265: Remove targ_enable()/targ_disable() frontend methods. Those methods were never implemented, and I believe that their concept is wrong, since single frontend (SCSI port) can not handle several targets. Modified: stable/10/sys/cam/ctl/ctl.c stable/10/sys/cam/ctl/ctl_frontend.h stable/10/sys/cam/ctl/ctl_frontend_cam_sim.c stable/10/sys/cam/ctl/ctl_frontend_internal.c stable/10/sys/cam/ctl/ctl_frontend_iscsi.c stable/10/sys/cam/ctl/scsi_ctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/ctl.c Tue Jul 15 16:55:13 2014 (r268676) @@ -331,8 +331,6 @@ static int ctl_open(struct cdev *dev, in static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td); static void ctl_ioctl_online(void *arg); static void ctl_ioctl_offline(void *arg); -static int ctl_ioctl_targ_enable(void *arg, struct ctl_id targ_id); -static int ctl_ioctl_targ_disable(void *arg, struct ctl_id targ_id); static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id); static int ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id); static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio); @@ -1095,8 +1093,6 @@ ctl_init(void) fe->port_online = ctl_ioctl_online; fe->port_offline = ctl_ioctl_offline; fe->onoff_arg = &softc->ioctl_info; - fe->targ_enable = ctl_ioctl_targ_enable; - fe->targ_disable = ctl_ioctl_targ_disable; fe->lun_enable = ctl_ioctl_lun_enable; fe->lun_disable = ctl_ioctl_lun_disable; fe->targ_lun_arg = &softc->ioctl_info; @@ -1451,22 +1447,6 @@ bailout: return (retval); } -/* - * XXX KDM should we pretend to do something in the target/lun - * enable/disable functions? - */ -static int -ctl_ioctl_targ_enable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int -ctl_ioctl_targ_disable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id) { @@ -4313,24 +4293,6 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft STAILQ_FOREACH(fe, &ctl_softc->fe_list, links) { int retval; - /* - * XXX KDM this only works for ONE TARGET ID. We'll need - * to do things differently if we go to a multiple target - * ID scheme. - */ - if ((fe->status & CTL_PORT_STATUS_TARG_ONLINE) == 0) { - - retval = fe->targ_enable(fe->targ_lun_arg, target_id); - if (retval != 0) { - printf("ctl_alloc_lun: FETD %s port %d " - "returned error %d for targ_enable on " - "target %ju\n", fe->port_name, - fe->targ_port, retval, - (uintmax_t)target_id.id); - } else - fe->status |= CTL_PORT_STATUS_TARG_ONLINE; - } - retval = fe->lun_enable(fe->targ_lun_arg, target_id,lun_number); if (retval != 0) { printf("ctl_alloc_lun: FETD %s port %d returned error " Modified: stable/10/sys/cam/ctl/ctl_frontend.h ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend.h Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/ctl_frontend.h Tue Jul 15 16:55:13 2014 (r268676) @@ -105,30 +105,6 @@ typedef int (*fe_devid_t)(struct ctl_scs * and port_offline(). This is specified by the * FETD. * - * targ_enable(): This function is called, with targ_lun_arg and a - * target ID as its arguments, by CTL when it wants - * the FETD to enable a particular target. targ_enable() - * will always be called for a particular target ID - * before any LUN is enabled for that target. If the - * FETD does not support enabling targets, but rather - * LUNs, it should ignore this call and return 0. If - * the FETD does support enabling targets, it should - * return 0 for success and non-zero if it cannot - * enable the given target. - * - * TODO: Add the ability to specify a WWID here. - * - * targ_disable(): This function is called, with targ_lun_arg and a - * target ID as its arguments, by CTL when it wants - * the FETD to disable a particular target. - * targ_disable() will always be called for a - * particular target ID after all LUNs are disabled - * on that particular target. If the FETD does not - * support enabling targets, it should ignore this - * call and return 0. If the FETD does support - * enabling targets, it should return 0 for success, - * and non-zero if it cannot disable the given target. - * * lun_enable(): This function is called, with targ_lun_arg, a target * ID and a LUN ID as its arguments, by CTL when it * wants the FETD to enable a particular LUN. If the @@ -212,8 +188,6 @@ struct ctl_frontend { port_func_t port_online; /* passed to CTL */ port_func_t port_offline; /* passed to CTL */ void *onoff_arg; /* passed to CTL */ - targ_func_t targ_enable; /* passed to CTL */ - targ_func_t targ_disable; /* passed to CTL */ lun_func_t lun_enable; /* passed to CTL */ lun_func_t lun_disable; /* passed to CTL */ fe_ioctl_t ioctl; /* passed to CTL */ Modified: stable/10/sys/cam/ctl/ctl_frontend_cam_sim.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_cam_sim.c Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/ctl_frontend_cam_sim.c Tue Jul 15 16:55:13 2014 (r268676) @@ -101,8 +101,6 @@ void cfcs_shutdown(void); static void cfcs_poll(struct cam_sim *sim); static void cfcs_online(void *arg); static void cfcs_offline(void *arg); -static int cfcs_targ_enable(void *arg, struct ctl_id targ_id); -static int cfcs_targ_disable(void *arg, struct ctl_id targ_id); static int cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id); static void cfcs_datamove(union ctl_io *io); @@ -163,8 +161,6 @@ cfcs_init(void) fe->port_online = cfcs_online; fe->port_offline = cfcs_offline; fe->onoff_arg = softc; - fe->targ_enable = cfcs_targ_enable; - fe->targ_disable = cfcs_targ_disable; fe->lun_enable = cfcs_lun_enable; fe->lun_disable = cfcs_lun_disable; fe->targ_lun_arg = softc; @@ -336,18 +332,6 @@ cfcs_offline(void *arg) } static int -cfcs_targ_enable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int -cfcs_targ_disable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id) { return (0); Modified: stable/10/sys/cam/ctl/ctl_frontend_internal.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_internal.c Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/ctl_frontend_internal.c Tue Jul 15 16:55:13 2014 (r268676) @@ -192,8 +192,6 @@ int cfi_init(void); void cfi_shutdown(void) __unused; static void cfi_online(void *arg); static void cfi_offline(void *arg); -static int cfi_targ_enable(void *arg, struct ctl_id targ_id); -static int cfi_targ_disable(void *arg, struct ctl_id targ_id); static int cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id); static void cfi_datamove(union ctl_io *io); @@ -261,8 +259,6 @@ cfi_init(void) fe->port_online = cfi_online; fe->port_offline = cfi_offline; fe->onoff_arg = softc; - fe->targ_enable = cfi_targ_enable; - fe->targ_disable = cfi_targ_disable; fe->lun_enable = cfi_lun_enable; fe->lun_disable = cfi_lun_disable; fe->targ_lun_arg = softc; @@ -347,18 +343,6 @@ cfi_offline(void *arg) } static int -cfi_targ_enable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int -cfi_targ_disable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id) { struct cfi_softc *softc; Modified: stable/10/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/ctl_frontend_iscsi.c Tue Jul 15 16:55:13 2014 (r268676) @@ -149,8 +149,6 @@ SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO int cfiscsi_init(void); static void cfiscsi_online(void *arg); static void cfiscsi_offline(void *arg); -static int cfiscsi_targ_enable(void *arg, struct ctl_id targ_id); -static int cfiscsi_targ_disable(void *arg, struct ctl_id targ_id); static int cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id); static int cfiscsi_lun_disable(void *arg, @@ -1346,8 +1344,6 @@ cfiscsi_init(void) fe->port_online = cfiscsi_online; fe->port_offline = cfiscsi_offline; fe->onoff_arg = softc; - fe->targ_enable = cfiscsi_targ_enable; - fe->targ_disable = cfiscsi_targ_disable; fe->lun_enable = cfiscsi_lun_enable; fe->lun_disable = cfiscsi_lun_disable; fe->targ_lun_arg = softc; @@ -1451,20 +1447,6 @@ cfiscsi_offline(void *arg) #endif } -static int -cfiscsi_targ_enable(void *arg, struct ctl_id targ_id) -{ - - return (0); -} - -static int -cfiscsi_targ_disable(void *arg, struct ctl_id targ_id) -{ - - return (0); -} - static void cfiscsi_ioctl_handoff(struct ctl_iscsi *ci) { Modified: stable/10/sys/cam/ctl/scsi_ctl.c ============================================================================== --- stable/10/sys/cam/ctl/scsi_ctl.c Tue Jul 15 16:54:04 2014 (r268675) +++ stable/10/sys/cam/ctl/scsi_ctl.c Tue Jul 15 16:55:13 2014 (r268676) @@ -211,8 +211,6 @@ static void ctlfedone(struct cam_periph static void ctlfe_onoffline(void *arg, int online); static void ctlfe_online(void *arg); static void ctlfe_offline(void *arg); -static int ctlfe_targ_enable(void *arg, struct ctl_id targ_id); -static int ctlfe_targ_disable(void *arg, struct ctl_id targ_id); static int ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id); static int ctlfe_lun_disable(void *arg, struct ctl_id targ_id, @@ -410,8 +408,6 @@ ctlfeasync(void *callback_arg, uint32_t fe->port_online = ctlfe_online; fe->port_offline = ctlfe_offline; fe->onoff_arg = bus_softc; - fe->targ_enable = ctlfe_targ_enable; - fe->targ_disable = ctlfe_targ_disable; fe->lun_enable = ctlfe_lun_enable; fe->lun_disable = ctlfe_lun_disable; fe->targ_lun_arg = bus_softc; @@ -1927,18 +1923,6 @@ ctlfe_offline(void *arg) xpt_free_path(path); } -static int -ctlfe_targ_enable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - -static int -ctlfe_targ_disable(void *arg, struct ctl_id targ_id) -{ - return (0); -} - /* * This will get called to enable a LUN on every bus that is attached to * CTL. So we only need to create a path/periph for this particular bus.