From owner-svn-src-all@freebsd.org Wed Jan 15 01:31:58 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFBF01FB282; Wed, 15 Jan 2020 01:31:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47y8v25QRxz3NqX; Wed, 15 Jan 2020 01:31:58 +0000 (UTC) (envelope-from mjg@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 B4B5C26B70; Wed, 15 Jan 2020 01:31:58 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00F1VwwK048352; Wed, 15 Jan 2020 01:31:58 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00F1VwJ0048350; Wed, 15 Jan 2020 01:31:58 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001150131.00F1VwJ0048350@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 15 Jan 2020 01:31:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356743 - head/sys/fs/nfsserver X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/fs/nfsserver X-SVN-Commit-Revision: 356743 X-SVN-Commit-Repository: base 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.29 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, 15 Jan 2020 01:31:58 -0000 Author: mjg Date: Wed Jan 15 01:31:57 2020 New Revision: 356743 URL: https://svnweb.freebsd.org/changeset/base/356743 Log: nfs: add missing CLTFLAG_MPSAFE annotations Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c head/sys/fs/nfsserver/nfs_nfsdport.c Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Jan 15 01:31:28 2020 (r356742) +++ head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Jan 15 01:31:57 2020 (r356743) @@ -187,9 +187,9 @@ sysctl_tcphighwater(SYSCTL_HANDLER_ARGS) nfsrc_tcphighwater = newhighwater; return (0); } -SYSCTL_PROC(_vfs_nfsd, OID_AUTO, tcphighwater, CTLTYPE_UINT | CTLFLAG_RW, 0, - sizeof(nfsrc_tcphighwater), sysctl_tcphighwater, "IU", - "High water mark for TCP cache entries"); +SYSCTL_PROC(_vfs_nfsd, OID_AUTO, tcphighwater, + CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, sizeof(nfsrc_tcphighwater), + sysctl_tcphighwater, "IU", "High water mark for TCP cache entries"); static u_int nfsrc_udphighwater = NFSRVCACHE_UDPHIGHWATER; SYSCTL_UINT(_vfs_nfsd, OID_AUTO, udphighwater, CTLFLAG_RW, Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 15 01:31:28 2020 (r356742) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Wed Jan 15 01:31:57 2020 (r356743) @@ -188,9 +188,9 @@ sysctl_dsdirsize(SYSCTL_HANDLER_ARGS) nfsrv_dsdirsize = newdsdirsize; return (0); } -SYSCTL_PROC(_vfs_nfsd, OID_AUTO, dsdirsize, CTLTYPE_UINT | CTLFLAG_RW, 0, - sizeof(nfsrv_dsdirsize), sysctl_dsdirsize, "IU", - "Number of dsN subdirs on the DS servers"); +SYSCTL_PROC(_vfs_nfsd, OID_AUTO, dsdirsize, + CTLTYPE_UINT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, sizeof(nfsrv_dsdirsize), + sysctl_dsdirsize, "IU", "Number of dsN subdirs on the DS servers"); #define MAX_REORDERED_RPC 16 #define NUM_HEURISTIC 1031