From nobody Wed Sep 24 08:23:26 2025 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 4cWqcG5TfMz68j8D; Wed, 24 Sep 2025 08:23:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWqcG4gy5z3n8s; Wed, 24 Sep 2025 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758702206; 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=vfO01RvoG61GC+kIKB0kwebRctUddUK4HTd7oqqJtPc=; b=tKROrZdzMWkJ5Vy/CoOvMDEipLFQEAzyGQiR41/S2BulD65ERhtz0fKaDByu4kXaoL/OZd adj+JBY3BZugilOfqnMzF8nGZtTaT2v0Is2ckbWS0EqUuuIqq3PPENwQn3ZHeMUP5Y0WYg Ulju6sWTGHDjZs2dROveDJiXsNPL49yU0Y1fDfEKnk7Q15m7gHcsT7ATpJwAWI8lBChk1u Yd73qj6t5tvl7lzRjtKR4Vr+oQToCkF2AfA0yx3xTyavix4ZqxQ7GUNSpXboDxfKOWRQYX 3rCuAmviZDVpy4pABtJdLJnPHoYmeLFUZYWpO9gmLsqRXRSjtzE7otLaPmpxLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758702206; 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=vfO01RvoG61GC+kIKB0kwebRctUddUK4HTd7oqqJtPc=; b=llkfEEbB+4E9HVOFedqy1WuFQY9CvapG25xbckAvsxW1227OAh6CMGRJl5x0nPU//mCV+6 H1WM8KAe2tyJzCl88kyxXWrVfmRIrR9jJ6FrjaxP8TfbpJyF42Q9Jwhee1EVgcV1G/F+Ya 6ngAqfZap38NjTcUwJ+15ED4GmDxB5fBwA+N2VWK3xU7gUc3NcDkQdEklQ9T/VbNeGisQb 9QxYdgHOc78CuyVh344SWHazfdBcAlMUaWLdzgTz7mgbx11bsnOzp3xfwliZX045a2Q5WA 1VK8VD20KHNotGVPeKDQcIxWdGF1DoIl451JpEI6p8MwHMrBJIv7Nc+BGou7Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758702206; a=rsa-sha256; cv=none; b=BMAefDu81R++FsHApgiOoVoyjwyWzkLN56uA4PPSCO3JH4igfV2p0QTxcrkthW2klzui8w hUc4uxFf/U018VY0j55lBA7dyfAvFxZ/WsAxx3v1XMoZaF2I0E/U/j58/9HkKlhsYhAUb5 avR+UWOfwrUe1rkJ8SFeAOqCYA3bDQTSBu7MGUMdPfdwf0ClZNxhUB9oW/OiNP+h6KI7de hvxS48eYe8exO5Axkz2uGyCGxnOxucnEuOeJNwWg8/33+tvimtkAvTkgLuHbWfnCuLx+Mf gaV6sJNXpZA5MdY5Ghw62LjkUpWmj849/BpizeixwjzyAMncd9CcAjmY6DssCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWqcG4BVNz7tn; Wed, 24 Sep 2025 08:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58O8NQhX004882; Wed, 24 Sep 2025 08:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O8NQw2004879; Wed, 24 Sep 2025 08:23:26 GMT (envelope-from git) Date: Wed, 24 Sep 2025 08:23:26 GMT Message-Id: <202509240823.58O8NQw2004879@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: 185c2c3dab36 - main - vfs: reduce indentation in vput_final 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 185c2c3dab3627bac929143795cec2d78d0aceab Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=185c2c3dab3627bac929143795cec2d78d0aceab commit 185c2c3dab3627bac929143795cec2d78d0aceab Author: Mateusz Guzik AuthorDate: 2025-09-22 14:09:51 +0000 Commit: Mateusz Guzik CommitDate: 2025-09-24 08:23:21 +0000 vfs: reduce indentation in vput_final nfc --- sys/kern/vfs_subr.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index fe299ecc9c56..9818c60ca387 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3644,26 +3644,26 @@ vput_final(struct vnode *vp, enum vput_op func) } break; } - if (error == 0) { - if (func == VUNREF) { - VNASSERT((vp->v_vflag & VV_UNREF) == 0, vp, - ("recursive vunref")); - vp->v_vflag |= VV_UNREF; - } - for (;;) { - error = vinactive(vp); - if (want_unlock) - VOP_UNLOCK(vp); - if (error != ERELOOKUP || !want_unlock) - break; - VOP_LOCK(vp, LK_EXCLUSIVE); - } - if (func == VUNREF) - vp->v_vflag &= ~VV_UNREF; - vdropl(vp); - } else { + if (error != 0) { vdefer_inactive(vp); + return; + } + if (func == VUNREF) { + VNASSERT((vp->v_vflag & VV_UNREF) == 0, vp, + ("recursive vunref")); + vp->v_vflag |= VV_UNREF; } + for (;;) { + error = vinactive(vp); + if (want_unlock) + VOP_UNLOCK(vp); + if (error != ERELOOKUP || !want_unlock) + break; + VOP_LOCK(vp, LK_EXCLUSIVE); + } + if (func == VUNREF) + vp->v_vflag &= ~VV_UNREF; + vdropl(vp); return; out: if (func == VPUT)