git: 4f21442e10db - main - null_lookup: restore dvp lock always, not only on success
Konstantin Belousov
kib at FreeBSD.org
Tue Jul 27 16:58:59 UTC 2021
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=4f21442e10dbb22f1bd4c990dc0b1a2aa51231b9
commit 4f21442e10dbb22f1bd4c990dc0b1a2aa51231b9
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-07-21 13:19:51 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-07-27 16:58:47 +0000
null_lookup: restore dvp lock always, not only on success
Caller of VOP_LOOKUP() passes dvp locked and expect it locked on return.
Relock of lower vnode in any case could leave upper vnode reclaimed and
unlocked.
Reported and tested by: pho
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Differential revision: https://reviews.freebsd.org/D31310
---
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 47b0bda32b6b..43dc325a79f5 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
More information about the dev-commits-src-all
mailing list