From nobody Sun Mar 27 14:38:08 2022 X-Original-To: dev-commits-src-all@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 C71A21A46664; Sun, 27 Mar 2022 14:38:08 +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 4KRJN05Bh1z4ly8; Sun, 27 Mar 2022 14:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648391888; 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=aXPuUpPhX0tqSQ8vTdUNjRvOepsxuikAa50fW3rFa7o=; b=D8XBhZQXlFvFHEYdFm3lLh0p/fqCMwgpGZnbuBgEfJOK7BL107hD1Ipkj9kvVwajNPMLF6 zGj0CM9zFCBlz5XkKuYzgXGTR25B9fKjhu09wunbwrJebqxidX+Oe9xUdeN4/z5dSh5UoP gujGHPsklWt+62hB/aYJjHTbOv4eUiRxdamDd4qiAZ+dJSeuGbxq2qkSoawyRedRTc+YE8 XTNcm4vbp9mPYauZaryYsB5civYxcdk6OnNWPk+gh5yF7wM8DCq2UKWe90ld123wEYKR9o LgsxajzUhXU99ijhUgOdv0eycuyzTLfMDPKVPqn8UZtpWj+ySZaDVP0Vox+iLw== 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 9266317249; Sun, 27 Mar 2022 14:38:08 +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 22REc8Fd077884; Sun, 27 Mar 2022 14:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22REc8pI077883; Sun, 27 Mar 2022 14:38:08 GMT (envelope-from git) Date: Sun, 27 Mar 2022 14:38:08 GMT Message-Id: <202203271438.22REc8pI077883@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: 727277325d2c - stable/13 - vfs: add missing bits to vdropl_impl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 727277325d2c3b1925880d07634f0270000136f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648391888; 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=aXPuUpPhX0tqSQ8vTdUNjRvOepsxuikAa50fW3rFa7o=; b=QOTfMnHFW2ZP/vwGzgtlB3Cbry44R5excgUJ3/kTQWIX8JdZC4QJY89V5FBUaeeUuMbpKY 1Tn3BrKAOPtKMRH79IuTv0jRMlZmEOs+zv1A2Kz3AZzPnPCBq4dZAkxt+mqevHDUb8UUMd 64YI/oEmvu3HYEDmXdIVINWYvQN0Zi5vkK0B97eEg3Fa5Nd4j5XWpiuuy4Y+jyWckiGXXK +uDs4PTpr6V5drlvJ49X2m64B9MDI+wYgEokccMNXF3r2OSsIuOIzF2LvEU8gVRC+Vue7y /2LYBZY6Tf9KTHsESTX8vTtISR5/xlzTQzUNJ9TKuspN4CDN7eAYULGDipHRjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648391888; a=rsa-sha256; cv=none; b=MmIA4uowHPtVapNP6BHIgtqXxZYpn9p78xSPqa4/IplKWIOybYgoqvVb0uda+CD97MoqWF htRme8C0f4SGVhvZto2Ge0xb0881CYCHYIYzraQcd3Kz1M5bDvNo9AokCXAuHuHlLHUKnM vzk6OpaT0IpuWOWNc8x9WPbRYGuqEnTb03NDh8TGCknzLfwkjgBMfv5YbXCUumk4tvVd5W riFI+ZhLLXpKB8cG9xmu8lOOcAJmeirQOTZVEB7HKIyBfMhBl+WxXoSVA9VtSTLga4N5dI ZJ76NUd7MtySBpyj/feO4zgShcCFWuH8+6q2Ah5tChQOIyDQIuRYocC4lApc2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=727277325d2c3b1925880d07634f0270000136f2 commit 727277325d2c3b1925880d07634f0270000136f2 Author: Mateusz Guzik AuthorDate: 2022-03-27 14:00:09 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-27 14:37:58 +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") (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