git: a3c7e571c089 - stable/13 - null_lookup: restore dvp lock always, not only on success

[Konstantin Belousov]

The branch stable/13 has been updated by kib:

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

commit a3c7e571c08944082d134f8a2b883e80e9f0321a
Author:     Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-07-21 13:19:51 +0000
Commit:     Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-08-03 09:52:35 +0000

    null_lookup: restore dvp lock always, not only on success
    
    (cherry picked from commit 4f21442e10dbb22f1bd4c990dc0b1a2aa51231b9)
---
 sys/fs/nullfs/null_vnops.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 03f8b0dcbf7d..eed0d6c74138 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -436,11 +436,12 @@ null_lookup(struct vop_lookup_args *ap)
 	 * dvp to be reclaimed due to shared v_vnlock.  Check for the
 	 * doomed state and return error.
 	 */
-	if ((error == 0 || error == EJUSTRETURN) &&
-	    VN_IS_DOOMED(dvp)) {
-		error = ENOENT;
-		if (lvp != NULL)
-			vput(lvp);
+	if (VN_IS_DOOMED(dvp)) {
+		if (error == 0 || error == EJUSTRETURN) {
+			if (lvp != NULL)
+				vput(lvp);
+			error = ENOENT;
+		}
 
 		/*
 		 * If vgone() did reclaimed dvp before curthread