The branch main has been updated by mjg:

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

commit 2e96132a7d8bbb2347a3b4776806324f984aa49f
Author:     Mateusz Guzik <[email protected]>
AuthorDate: 2021-02-05 22:49:59 +0000
Commit:     Mateusz Guzik <[email protected]>
CommitDate: 2021-02-05 23:28:39 +0000

    cache: drop spurious arg from panic in cache_validate
    
    vp is already reported when noting mismatch
---
 sys/kern/vfs_cache.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 47abe0feb152..5cfc23779c42 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -2824,9 +2824,8 @@ cache_validate(struct vnode *dvp, struct vnode *vp, 
struct componentname *cnp)
                if (ncp->nc_dvp == dvp && ncp->nc_nlen == cnp->cn_namelen &&
                    !bcmp(ncp->nc_name, cnp->cn_nameptr, ncp->nc_nlen)) {
                        if (ncp->nc_vp != vp)
-                               panic("%s: mismatch (%p != %p); ncp %p [%s] dvp 
%p vp %p\n",
-                                   __func__, vp, ncp->nc_vp, ncp, 
ncp->nc_name, ncp->nc_dvp,
-                                   ncp->nc_vp);
+                               panic("%s: mismatch (%p != %p); ncp %p [%s] dvp 
%p\n",
+                                   __func__, vp, ncp->nc_vp, ncp, 
ncp->nc_name, ncp->nc_dvp);
                }
        }
        mtx_unlock(blp);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"

Reply via email to