From owner-svn-src-all@FreeBSD.ORG Sat Jul 5 13:50:06 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E3C548D; Sat, 5 Jul 2014 13:50:06 +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 6199B2BB4; Sat, 5 Jul 2014 13:50:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65Do6Tc056759; Sat, 5 Jul 2014 13:50:06 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65Do5pL056753; Sat, 5 Jul 2014 13:50:05 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407051350.s65Do5pL056753@svn.freebsd.org> From: Alexander Motin Date: Sat, 5 Jul 2014 13:50:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268287 - head/sys/cam/ctl X-SVN-Group: head 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: Sat, 05 Jul 2014 13:50:06 -0000 Author: mav Date: Sat Jul 5 13:50:05 2014 New Revision: 268287 URL: http://svnweb.freebsd.org/changeset/base/268287 Log: Implement and use ctl_frontend_find(). Modified: head/sys/cam/ctl/ctl.c head/sys/cam/ctl/ctl_frontend.c head/sys/cam/ctl/ctl_frontend.h Modified: head/sys/cam/ctl/ctl.c ============================================================================== --- head/sys/cam/ctl/ctl.c Sat Jul 5 07:15:19 2014 (r268286) +++ head/sys/cam/ctl/ctl.c Sat Jul 5 13:50:05 2014 (r268287) @@ -3121,13 +3121,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, ci = (struct ctl_iscsi *)addr; - mtx_lock(&softc->ctl_lock); - STAILQ_FOREACH(fe, &softc->fe_list, links) { - if (strcmp(fe->name, "iscsi") == 0) - break; - } - mtx_unlock(&softc->ctl_lock); - + fe = ctl_frontend_find("iscsi"); if (fe == NULL) { ci->status = CTL_ISCSI_ERROR; snprintf(ci->error_str, sizeof(ci->error_str), Modified: head/sys/cam/ctl/ctl_frontend.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend.c Sat Jul 5 07:15:19 2014 (r268286) +++ head/sys/cam/ctl/ctl_frontend.c Sat Jul 5 13:50:05 2014 (r268287) @@ -118,6 +118,23 @@ ctl_frontend_deregister(struct ctl_front return (0); } +struct ctl_frontend * +ctl_frontend_find(char *frontend_name) +{ + struct ctl_softc *ctl_softc = control_softc; + struct ctl_frontend *fe; + + mtx_lock(&ctl_softc->ctl_lock); + STAILQ_FOREACH(fe, &ctl_softc->fe_list, links) { + if (strcmp(fe->name, frontend_name) == 0) { + mtx_unlock(&ctl_softc->ctl_lock); + return (fe); + } + } + mtx_unlock(&ctl_softc->ctl_lock); + return (NULL); +} + int ctl_port_register(struct ctl_port *port, int master_shelf) { Modified: head/sys/cam/ctl/ctl_frontend.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend.h Sat Jul 5 07:15:19 2014 (r268286) +++ head/sys/cam/ctl/ctl_frontend.h Sat Jul 5 13:50:05 2014 (r268287) @@ -259,6 +259,11 @@ int ctl_frontend_register(struct ctl_fro int ctl_frontend_deregister(struct ctl_frontend *fe); /* + * Find the frontend by its name. Returns NULL if not found. + */ +struct ctl_frontend * ctl_frontend_find(char *frontend_name); + +/* * This may block until resources are allocated. Called at FETD module load * time. Returns 0 for success, non-zero for failure. */