From nobody Sun Mar 27 14:40:00 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 649021A466F9; Sun, 27 Mar 2022 14:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRJQ82LhYz4mGK; Sun, 27 Mar 2022 14:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648392000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8OwVSVEW/DHs3FHzUOB6EwDTClKpv57eJU8FLrjh8qk=; b=xuRBuZT+AtWMsPt6kj+K74ddb1EWzll9LX/OZBJo6FLRMZxQXOq3dNSEQhbwWFhxMFVXCG CCF/6Ji/eNT+viInu1Wa6ZrAhG1+LI3A2fTKVY71VlahqM1nsGbQGKWJF8seNslgtvsR0E Hk11wT6VF7OiY7r3JyA38/mjQm3h61Nn+0ec9yYOMwP/M1832v0LDpw5RLUCr4iHeSnsD2 CxCtT99VDCJvsvOGiTy/Brz19YNMWCjhCS69q5y1geAcs/h71tIiW2+9bkeuAbDpdUtwir CMNL7jMvEzRVe8BAcfxZlINAEj/SorYkJhdzADrGjGRb3Sfu9nW+o6PnBD0R1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30B301724A; Sun, 27 Mar 2022 14:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22REe0qu078269; Sun, 27 Mar 2022 14:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22REe0hw078252; Sun, 27 Mar 2022 14:40:00 GMT (envelope-from git) Date: Sun, 27 Mar 2022 14:40:00 GMT Message-Id: <202203271440.22REe0hw078252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 4e8fa94f335b - releng/13.1 - vfs: add missing bits to vdropl_impl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 4e8fa94f335b6ec164dfe3b18535f795ad8bfaac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648392000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8OwVSVEW/DHs3FHzUOB6EwDTClKpv57eJU8FLrjh8qk=; b=ip6W8gCa5774+Xar1vLsJbHm8853DYwwYItG3+AaJ9I6ctd3pecPN6tYuYYGZ96kTeaUDJ qsS0jOz+Qsx6FNXRFNO5v3Slm4w09qwOHDO2u0yiym/E+LMr1pPELGsKtWFN+ZKO3OuLpu FPbk4XJbJalZi/T6wOYZ8cWDcp4OBx/xd1PFSNvjdJkaT7cv9EA+Khwf8zE7RZUgwJAnlI FVqxYcIYW1ekPwf13OjeYABgh6Y0RwVZQKwm4olK0CqN/H+p508Xuc04hKSNJCUw+PCkul o55IUuG+miccn5yBh9SzAvo9HzonkqMMH9IR++/sKgrKKmQ+HbBAOCLmWLzDDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648392000; a=rsa-sha256; cv=none; b=PQVlTIauoOmcyMFLWNJvNpiC/4ajrAoAe/GH0if72leO0V+g1A1yl0TK0XkzRhaTXCxQcD OX2Ejqm+5iNX5B4HHlPfxJVdOwg1R272u9DBCudjWMwrZjakaYdL0O62muD2Izf9wFSBS7 opgCmhu1TXDeB7AzA7ecFVKdjInoYfuGkhx1TSyPuzWoCAuEWYLoHVJsJC+G+ChoJQY8Mg BjcAHuR+7ljTnl26/r+G3xGelFWOMX/RgdMW5UUs41OwS+gVFfFARKqtwHF5udrW/J9MD4 7Ix7TACKHrHwnh2iJjDGCFVT9UlMfsrQ54GXFtXh8IaACIGydLbutoAdlXUugw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8fa94f335b6ec164dfe3b18535f795ad8bfaac commit 4e8fa94f335b6ec164dfe3b18535f795ad8bfaac Author: Mateusz Guzik AuthorDate: 2022-03-27 14:00:09 +0000 Commit: Mateusz Guzik 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