git: eca899bd5d17 - main - cache: remove spurious null check in sdt probe

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=eca899bd5d1743c031d91b7794522a7e21ffc4c7

commit eca899bd5d1743c031d91b7794522a7e21ffc4c7
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2020-12-31 07:22:30 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
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;