From owner-svn-src-releng@freebsd.org Thu Jun 14 17:42:20 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13C7F10177B4; Thu, 14 Jun 2018 17:42:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE2AA77654; Thu, 14 Jun 2018 17:42:19 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F7A73EC1; Thu, 14 Jun 2018 17:42:19 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5EHgJKs008775; Thu, 14 Jun 2018 17:42:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5EHgJ4X008774; Thu, 14 Jun 2018 17:42:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806141742.w5EHgJ4X008774@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 14 Jun 2018 17:42:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r335163 - releng/11.2/sys/dev/ocs_fc X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/sys/dev/ocs_fc X-SVN-Commit-Revision: 335163 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 17:42:20 -0000 Author: gjb Date: Thu Jun 14 17:42:19 2018 New Revision: 335163 URL: https://svnweb.freebsd.org/changeset/base/335163 Log: MFS11 r334872 (ram): MFC r334657: Issue: Utility hangs when OCS_IOCTL_CMD_MGMT_GET_ALL called in parallel on port 0 and port 1. Fix: Using static structure for results is corrupting the second ioctl request. Removed static for results structure. Approved by: re (marius) Sponsored by: The FreeBSD Foundation Modified: releng/11.2/sys/dev/ocs_fc/ocs_mgmt.c Directory Properties: releng/11.2/ (props changed) Modified: releng/11.2/sys/dev/ocs_fc/ocs_mgmt.c ============================================================================== --- releng/11.2/sys/dev/ocs_fc/ocs_mgmt.c Thu Jun 14 17:36:02 2018 (r335162) +++ releng/11.2/sys/dev/ocs_fc/ocs_mgmt.c Thu Jun 14 17:42:19 2018 (r335163) @@ -2373,7 +2373,7 @@ static void get_nv_wwpn(ocs_t *ocs, char *name, ocs_textbuf_t *textbuf) { char result_string[24]; - static ocs_mgmt_get_nvparms_result_t result; + ocs_mgmt_get_nvparms_result_t result; ocs_sem_init(&(result.semaphore), 0, "get_nv_wwpn"); @@ -2411,7 +2411,7 @@ static void get_nv_wwnn(ocs_t *ocs, char *name, ocs_textbuf_t *textbuf) { char result_string[24]; - static ocs_mgmt_get_nvparms_result_t result; + ocs_mgmt_get_nvparms_result_t result; ocs_sem_init(&(result.semaphore), 0, "get_nv_wwnn");