From owner-svn-src-all@FreeBSD.ORG Wed Jul 2 10:36:05 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 84149D47; Wed, 2 Jul 2014 10:36:05 +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 581D9254B; Wed, 2 Jul 2014 10:36:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s62Aa5gs084099; Wed, 2 Jul 2014 10:36:05 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s62Aa4L5084096; Wed, 2 Jul 2014 10:36:04 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201407021036.s62Aa4L5084096@svn.freebsd.org> From: Alexander Motin Date: Wed, 2 Jul 2014 10:36:04 +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: r268144 - 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: Wed, 02 Jul 2014 10:36:05 -0000 Author: mav Date: Wed Jul 2 10:36:04 2014 New Revision: 268144 URL: http://svnweb.freebsd.org/changeset/base/268144 Log: MFC r267485: Remove non-functional remnants of control LUN -- 18MB of RAM for nothing. Modified: stable/10/sys/cam/ctl/ctl.c stable/10/sys/cam/ctl/ctl_private.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Wed Jul 2 10:35:06 2014 (r268143) +++ stable/10/sys/cam/ctl/ctl.c Wed Jul 2 10:36:04 2014 (r268144) @@ -961,7 +961,6 @@ ctl_init(void) struct ctl_softc *softc; struct ctl_io_pool *internal_pool, *emergency_pool, *other_pool; struct ctl_frontend *fe; - struct ctl_lun *lun; uint8_t sc_id =0; int i, error, retval; //int isc_retval; @@ -1049,8 +1048,6 @@ ctl_init(void) STAILQ_INIT(&softc->be_list); STAILQ_INIT(&softc->io_pools); - lun = &softc->lun; - /* * We don't bother calling these with ctl_lock held here, because, * in theory, no one else can try to do anything while we're in our @@ -1085,16 +1082,6 @@ ctl_init(void) softc->emergency_pool = emergency_pool; softc->othersc_pool = other_pool; - /* - * We used to allocate a processor LUN here. The new scheme is to - * just let the user allocate LUNs as he sees fit. - */ -#if 0 - mtx_lock(&softc->ctl_lock); - ctl_alloc_lun(softc, lun, /*be_lun*/NULL, /*target*/softc->target); - mtx_unlock(&softc->ctl_lock); -#endif - if (worker_threads > MAXCPU || worker_threads == 0) { printf("invalid kern.cam.ctl.worker_threads value; " "setting to 1"); @@ -1116,9 +1103,6 @@ ctl_init(void) &softc->work_thread, NULL, 0, 0, "ctl", "work%d", i); if (error != 0) { printf("error creating CTL work thread!\n"); - mtx_lock(&softc->ctl_lock); - ctl_free_lun(lun); - mtx_unlock(&softc->ctl_lock); ctl_pool_free(internal_pool); ctl_pool_free(emergency_pool); ctl_pool_free(other_pool); Modified: stable/10/sys/cam/ctl/ctl_private.h ============================================================================== --- stable/10/sys/cam/ctl/ctl_private.h Wed Jul 2 10:35:06 2014 (r268143) +++ stable/10/sys/cam/ctl/ctl_private.h Wed Jul 2 10:36:04 2014 (r268144) @@ -426,7 +426,6 @@ struct ctl_softc { struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; struct ctl_ioctl_info ioctl_info; - struct ctl_lun lun; struct ctl_io_pool *internal_pool; struct ctl_io_pool *emergency_pool; struct ctl_io_pool *othersc_pool;