From owner-dev-commits-src-main@freebsd.org Sun Jan 3 06:53:12 2021 Return-Path: Delivered-To: dev-commits-src-main@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 BF81E4C7A92; Sun, 3 Jan 2021 06:53:12 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4D7qGJ4z2dz4WT3; Sun, 3 Jan 2021 06:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D4F72354F; Sun, 3 Jan 2021 06:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1036rCWu023187; Sun, 3 Jan 2021 06:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1036rCC5023186; Sun, 3 Jan 2021 06:53:12 GMT (envelope-from git) Date: Sun, 3 Jan 2021 06:53:12 GMT Message-Id: <202101030653.1036rCC5023186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: eca899bd5d17 - main - cache: remove spurious null check in sdt probe MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca899bd5d1743c031d91b7794522a7e21ffc4c7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2021 06:53:12 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=eca899bd5d1743c031d91b7794522a7e21ffc4c7 commit eca899bd5d1743c031d91b7794522a7e21ffc4c7 Author: Mateusz Guzik AuthorDate: 2020-12-31 07:22:30 +0000 Commit: Mateusz Guzik CommitDate: 2021-01-03 06:50:06 +0000 cache: remove spurious null check in sdt probe --- sys/kern/vfs_cache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 4b8940b7511c..e6f446d2d0e2 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5207,8 +5207,9 @@ out: __assert_unreachable(); break; case CACHE_FPL_STATUS_HANDLED: - SDT_PROBE3(vfs, namei, lookup, return, error, - (error == 0 ? ndp->ni_vp : NULL), true); + if (error != 0) + MPASS(ndp->ni_vp == NULL); + SDT_PROBE3(vfs, namei, lookup, return, error, ndp->ni_vp, true); break; case CACHE_FPL_STATUS_PARTIAL: *pwdp = fpl.pwd;