From owner-svn-src-head@freebsd.org Tue Mar 20 03:37:05 2018 Return-Path: Delivered-To: svn-src-head@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 3BB80F96; Tue, 20 Mar 2018 03:37:05 +0000 (UTC) (envelope-from imp@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 E579E7A887; Tue, 20 Mar 2018 03:37:04 +0000 (UTC) (envelope-from imp@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 C659B17A4F; Tue, 20 Mar 2018 03:37:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2K3b4HA028425; Tue, 20 Mar 2018 03:37:04 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2K3b4l6028424; Tue, 20 Mar 2018 03:37:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201803200337.w2K3b4l6028424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 20 Mar 2018 03:37:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331237 - head/sys/cam/nvme X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/nvme X-SVN-Commit-Revision: 331237 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Mar 2018 03:37:05 -0000 Author: imp Date: Tue Mar 20 03:37:04 2018 New Revision: 331237 URL: https://svnweb.freebsd.org/changeset/base/331237 Log: Remove some redundant MPSAFE flags. This was pointed out in a code review I'm having trouble finding right now, but go ahead and eliminate these. Sponsored by: Netfix Modified: head/sys/cam/nvme/nvme_da.c Modified: head/sys/cam/nvme/nvme_da.c ============================================================================== --- head/sys/cam/nvme/nvme_da.c Tue Mar 20 03:36:51 2018 (r331236) +++ head/sys/cam/nvme/nvme_da.c Tue Mar 20 03:37:04 2018 (r331237) @@ -626,25 +626,20 @@ ndasysctlinit(void *context, int pending) } SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "unmapped_io", CTLFLAG_RD | CTLFLAG_MPSAFE, - &softc->unmappedio, 0, "Unmapped I/O leaf"); + OID_AUTO, "unmapped_io", CTLFLAG_RD, + &softc->unmappedio, 0, "Unmapped I/O leaf"); SYSCTL_ADD_QUAD(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "deletes", CTLFLAG_RD | CTLFLAG_MPSAFE, - &softc->deletes, "Number of BIO_DELETE requests"); + OID_AUTO, "deletes", CTLFLAG_RD, + &softc->deletes, "Number of BIO_DELETE requests"); SYSCTL_ADD_QUAD(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, "dsm_req", CTLFLAG_RD | CTLFLAG_MPSAFE, - &softc->dsm_req, "Number of DSM requests sent to SIM"); + OID_AUTO, "dsm_req", CTLFLAG_RD, + &softc->dsm_req, "Number of DSM requests sent to SIM"); - SYSCTL_ADD_INT(&softc->sysctl_ctx, - SYSCTL_CHILDREN(softc->sysctl_tree), - OID_AUTO, - "rotating", - CTLFLAG_RD | CTLFLAG_MPSAFE, - &nda_rotating_media, - 0, - "Rotating media"); + SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree), + OID_AUTO, "rotating", CTLFLAG_RD, &nda_rotating_media, 1, + "Rotating media"); #ifdef CAM_IO_STATS softc->sysctl_stats_tree = SYSCTL_ADD_NODE(&softc->sysctl_stats_ctx, @@ -657,17 +652,17 @@ ndasysctlinit(void *context, int pending) } SYSCTL_ADD_INT(&softc->sysctl_stats_ctx, SYSCTL_CHILDREN(softc->sysctl_stats_tree), - OID_AUTO, "timeouts", CTLFLAG_RD | CTLFLAG_MPSAFE, + OID_AUTO, "timeouts", CTLFLAG_RD, &softc->timeouts, 0, "Device timeouts reported by the SIM"); SYSCTL_ADD_INT(&softc->sysctl_stats_ctx, SYSCTL_CHILDREN(softc->sysctl_stats_tree), - OID_AUTO, "errors", CTLFLAG_RD | CTLFLAG_MPSAFE, + OID_AUTO, "errors", CTLFLAG_RD, &softc->errors, 0, "Transport errors reported by the SIM."); SYSCTL_ADD_INT(&softc->sysctl_stats_ctx, SYSCTL_CHILDREN(softc->sysctl_stats_tree), - OID_AUTO, "pack_invalidations", CTLFLAG_RD | CTLFLAG_MPSAFE, + OID_AUTO, "pack_invalidations", CTLFLAG_RD, &softc->invalidations, 0, "Device pack invalidations."); #endif