From nobody Sun Mar 27 14:37:19 2022 X-Original-To: dev-commits-src-main@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 CFE611A4614B; Sun, 27 Mar 2022 14:37:19 +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 4KRJM35LDzz4lnt; Sun, 27 Mar 2022 14:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648391839; 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=9BilhxxmarOsmppyhrmmStzwU8nTwXnp97wJz9H/ia0=; b=LEkfbUF5G1EtpZb+LB9mi17xzGjXsXmgWdXL5hZT21uoq8fG/gmW4piZsuZ3LJqpowvieh PDCE9Xy2bnvQ2MEqNlPAKi4T96OpDFhwC09F24DGW893DgKs+BdmmIUSXlqqgPWxCSFhMp hnK5xenINNAWm2xmcJ2pdF9GkXAdXTGf/V+VLsH8vfec31U/PCjfarn4lZWnC3k1ItFTdH 1p3t7LgJVFWpobKE+UlJPnjqKFs3+xiGZcEpbhhvPABj40DRvGTzzisP4kWqhbrWmQ3IT8 DiSWPolnqumb+r4WTGZxdHMKk7ETrJeFoGuYRIsTDfrzMqr1w0iuN+WTyA+d7g== 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 97D2A17481; Sun, 27 Mar 2022 14:37:19 +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 22REbJ3q077722; Sun, 27 Mar 2022 14:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22REbJWI077721; Sun, 27 Mar 2022 14:37:19 GMT (envelope-from git) Date: Sun, 27 Mar 2022 14:37:19 GMT Message-Id: <202203271437.22REbJWI077721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 2533b5dc8270 - main - vfs: add missing bits to vdropl_impl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2533b5dc82701ac5e31d0f98dd15362397b2478e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648391839; 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=9BilhxxmarOsmppyhrmmStzwU8nTwXnp97wJz9H/ia0=; b=JAlFLq4L3BEZrT43rR0wtQreCzoDtJRHnNtDg+CztpaATqidt/S4RdRI619GMop8QeX63O XKV35ZHe55uO0TDJGdwa9F2OybCGWgy1rBVohTGxGjOTRDXtaY6fS8CTWC+1zvHkXey4aP C7eZWBjVoT2E5oTFYQyHZ48fXYiw79/1/k1xiNONTWKGnfE0Az28AIuZ0WzKO3nu+XfKIw CPF0sUuUvFeHImgKHvLXQT0lPGkzvzeuJQhNA8iD4OJfG4GO8bjMJTf7GMUpYrcxalzBx3 V8MUfzZV1r9PQMPzx+2TR4T6B/la4uCVHe+u/4AeOEC8aX+vyTYZxv9or7L/+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648391839; a=rsa-sha256; cv=none; b=M9tVByceHR1le0jvL9SK3vLA6hTZLojN326GRhMy6ftywAqHHF8pqfmVhth1vB9/rn7jZ2 2Qc+5KPWHH9owBo985nIsxIVKISEQzHIUYsonLSfGsX814iX549sAM1kjEjhbN7gWFmkNm ZyrcMh4/FshZStYB5FMPim+QTSK5xS4XLw2XwPyHjlvV5Lb4jOBBPEkdwWKV1PCJpEZIqx hO9Nb3ZVxaMpwpU2zX8oocu8/KEtqzOjGCI+M0ti84yXtdGlJLkud6IkE9JstzSXBIUigM zdOHIgGc5a+1UMB6QcWqQ3GygCCuogP9t1UgembSStuTsiURu7+WWKQAtr6JYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2533b5dc82701ac5e31d0f98dd15362397b2478e commit 2533b5dc82701ac5e31d0f98dd15362397b2478e Author: Mateusz Guzik AuthorDate: 2022-03-27 14:00:09 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-27 14:35:37 +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") --- 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 c498c9193754..6d7d189e1dd6 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3648,6 +3648,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