From nobody Sat Sep 17 10:36:32 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 4MV6mx25pvz4cKJ2; Sat, 17 Sep 2022 10:36:33 +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 4MV6mx1Vf9z3n9Z; Sat, 17 Sep 2022 10:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663410993; 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=w0gr6mI3vCggb106RXOaS3/l3bKLsHWPa6cTDi6cGHk=; b=bYC8ErPd2nzot0iyrcjqMsK7k1twCJshIKJJVNZK37Lqaq2/QfRNgTF3svWjILiv5WxMNM EzxvXOirA35XAWE7LOKSUfxyg2iJhQE4OCnMTiTdN1nOMFprTUsO2yq6aqzW7cPe1fW0R+ GawF6fSwaXY53vPCE3mq3zu7+lj3VAjGxT272jweM1pZofWR44BnDEjiR58bR6l7NNw5BQ /Vcz5VxRi5jsc5IwDU+KFgusnV/mjwa1ZdOAhxNj3GDqAy/tSvQTMUiF1Je5O3Z0cVV3rg FPG8ZagGuyUZJvsCs7FgM+4rYsmIm8ipCdYQIshG13MiytidMGxDTdg4PxhFKA== 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 4MV6mx0WMDzggp; Sat, 17 Sep 2022 10:36:33 +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 28HAaXlV087042; Sat, 17 Sep 2022 10:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HAaWBp087041; Sat, 17 Sep 2022 10:36:32 GMT (envelope-from git) Date: Sat, 17 Sep 2022 10:36:32 GMT Message-Id: <202209171036.28HAaWBp087041@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: aede6a9670aa - main - vfs: fixup parse_mount_dev_present after 5b5b7e2ca2fa9a2418dd51749f4ef6f881ae7179 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/main X-Git-Reftype: branch X-Git-Commit: aede6a9670aae8a6e4b89c520bc0672506c279ba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663410993; 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=w0gr6mI3vCggb106RXOaS3/l3bKLsHWPa6cTDi6cGHk=; b=CQhC/+bhq3xtMtmy9M+MEEFVXHd2wj7MFyrFAXGekMbEnfzLBwFaTRTc6WH+CWwCwoyS1X S+Uohlq9EdwT0al4er0072KIVln8Qxoe/c22fFjZctktO9J9OOYeWHugn0fNStzeRFUgzR i5XWecX5uKWC7gegBRCW54VvRyJ3ZwxcQROqiMNWdtHpkRsskAIhctB6M1B4qX88kQ7hYZ IN+AhmVu8S+wfzxxpre56nBxq+bP0QgwrbQbSuwzPtSswr5kd6fPsR0g07Hts9+g9jQXtG jwIbE/R83rQPAdGVhvjdUs68jnxIx+EOy0vRN19pG49ey3seBvKHQsoC5Y157A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663410993; a=rsa-sha256; cv=none; b=w9bBNLYtxbBrAC3HrJmvdsg/NM51rOpMtXeZbYIHbdkeWm8W7Q7jRp16mhPERs9VtJxzl2 XhA4im2O+J6PKGTJDN6QICey6IoJbbMJiXGEUkAroBeXXF8zDh0Ffc+Y0FqEMMYdapv6wR Dfku/Phyfc5v5PhEbJBaTkPRknNk/ej7dNWnM2AZUn1eOvtyZkVoB1MgClfMkPiPl8uwB/ Wgwp5qMx3of4IhstxE4vlSZE5ysTbEqrAhdurOrdqwoJW1mSw4JGrXRYEry8j7ET9EsPcD BCYWry8vYeQb4xHBycgc58rd4k7HLLp0UWlPxuhAWGDVy61UdORf7THH6eIKvQ== 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=aede6a9670aae8a6e4b89c520bc0672506c279ba commit aede6a9670aae8a6e4b89c520bc0672506c279ba Author: Mateusz Guzik AuthorDate: 2022-09-17 10:35:00 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-17 10:35:00 +0000 vfs: fixup parse_mount_dev_present after 5b5b7e2ca2fa9a2418dd51749f4ef6f881ae7179 Reported by: kib --- sys/kern/vfs_mountroot.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index 1cf5efb6e57e..ac0cec44f802 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -726,9 +726,10 @@ parse_mount_dev_present(const char *dev) NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, dev); error = namei(&nd); - if (!error) + if (!error) { vput(nd.ni_vp); - NDFREE_PNBUF(&nd); + NDFREE_PNBUF(&nd); + } return (error != 0) ? 0 : 1; }