git: 13b3862ee874 - main - cache: update an assert on CACHE_FPL_STATUS_ABORTED

Mateusz Guzik mjg at FreeBSD.org
Tue Apr 6 20:39:27 UTC 2021


The branch main has been updated by mjg:

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

commit 13b3862ee874db0b5efae484934de9b20da864e4
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-04-06 20:31:48 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-04-06 20:31:58 +0000

    cache: update an assert on CACHE_FPL_STATUS_ABORTED
    
    Since symlink support it can get upgraded to CACHE_FPL_STATUS_DESTROYED.
    
    Reported by:    bdrewery
---
 sys/kern/vfs_cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 649ee9b9783b..c4b6fdd468db 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -4660,7 +4660,8 @@ cache_fplookup_final_withparent(struct cache_fpl *fpl)
 
 	error = cache_fplookup_final_child(fpl, tvs);
 	if (__predict_false(error != 0)) {
-		MPASS(fpl->status == CACHE_FPL_STATUS_ABORTED);
+		MPASS(fpl->status == CACHE_FPL_STATUS_ABORTED ||
+		    fpl->status == CACHE_FPL_STATUS_DESTROYED);
 		if ((cnp->cn_flags & LOCKPARENT) != 0)
 			vput(dvp);
 		else


More information about the dev-commits-src-all mailing list