From owner-svn-src-all@freebsd.org Wed Aug 24 07:50:29 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6353BC4F2D; Wed, 24 Aug 2016 07:50:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8623A15BD; Wed, 24 Aug 2016 07:50:29 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7O7oSnv007503; Wed, 24 Aug 2016 07:50:28 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7O7oSp2007502; Wed, 24 Aug 2016 07:50:28 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201608240750.u7O7oSp2007502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 24 Aug 2016 07:50:28 +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: r304737 - 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.22 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, 24 Aug 2016 07:50:29 -0000 Author: mav Date: Wed Aug 24 07:50:28 2016 New Revision: 304737 URL: https://svnweb.freebsd.org/changeset/base/304737 Log: Fix HA mode configuration on FreeBSD 10.x. This is direct commit, compensating CTLFLAG_RDTUN difference between FreeBSD 10.x and 11.x branches. Modified: stable/10/sys/cam/ctl/ctl.c Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Wed Aug 24 06:22:53 2016 (r304736) +++ stable/10/sys/cam/ctl/ctl.c Wed Aug 24 07:50:28 2016 (r304737) @@ -1818,6 +1818,7 @@ ctl_init(void) NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); softc->flags = 0; + TUNABLE_INT_FETCH("kern.cam.ctl.ha_mode", (int *)&softc->ha_mode); SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "ha_mode", CTLFLAG_RDTUN, (int *)&softc->ha_mode, 0, "HA mode (0 - act/stby, 1 - serialize only, 2 - xfer)"); @@ -1827,6 +1828,7 @@ ctl_init(void) * figured out through the slot the controller is in. Although it * is an active/active system, someone has to be in charge. */ + TUNABLE_INT_FETCH("kern.cam.ctl.ha_id", &softc->ha_id); SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), OID_AUTO, "ha_id", CTLFLAG_RDTUN, &softc->ha_id, 0, "HA head ID (0 - no HA)");