Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Mar 2022 14:40:00 GMT
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 4e8fa94f335b - releng/13.1 - vfs: add missing bits to vdropl_impl
Message-ID:  <202203271440.22REe0hw078252@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.1 has been updated by mjg:

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

commit 4e8fa94f335b6ec164dfe3b18535f795ad8bfaac
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2022-03-27 14:00:09 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2022-03-27 14:39:45 +0000

    vfs: add missing bits to vdropl_impl
    
    This completes the patch which was originally meant to go in.
    
    Spotted by:     mhorne
    Fixes: c35ec1efdcb2978b ("vfs: [1/2] fix stalls in vnode reclaim by not
    requeieing from vnlru")
    Approved by:    re (implicit)
    
    (cherry picked from commit 2533b5dc82701ac5e31d0f98dd15362397b2478e)
---
 sys/kern/vfs_subr.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index d27e7a15d886..6c01b3dc817c 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -3668,6 +3668,12 @@ vdropl_impl(struct vnode *vp, bool enqueue)
 	if (vp->v_mflag & VMP_LAZYLIST) {
 		vunlazy(vp);
 	}
+
+	if (!enqueue) {
+		VI_UNLOCK(vp);
+		return;
+	}
+
 	/*
 	 * Also unlocks the interlock. We can't assert on it as we
 	 * released our hold and by now the vnode might have been



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203271440.22REe0hw078252>