From nobody Fri Feb 25 18:20:41 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 ED69C19CDFEB; Fri, 25 Feb 2022 18:20:41 +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 4K4ykd6Q95z4vvl; Fri, 25 Feb 2022 18:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645813241; 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=Lm30aJfc7WLrKB+S/7Tly8mUh+arNe8VeK4SKEALVZY=; b=NXgsZu1MV3P/ufNzYlvfQWXwMU+JugoIYkVAT0iibM+7WzCCUlpNFJ+QKNpXswsdNm5hx1 1Ldh0EjPAEziEK7exrE+sjlyBP+xl7+F91LGdmhecm70lxYbxe9WYUjk+CUqrl2LHssBg3 6byQNO/3Se0zXS9Rq6GSabRBmTZOwPTjYOO+UYi+VfAq/GS8C/DmWbOpe9kvFZtWjDdg3L G2HXEcbnlrOlCY1a+NVsFl+G6xoMJubkgJzg4gpBDgWahf60irbaYsqCvqk8cTWkK0+6z3 HTlGF8Jsd6qG+ny+NOeSMcSgplG2wwBmpPXNVykjEia3jtOT2BS3izkRNz/mjA== 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 BC3192471B; Fri, 25 Feb 2022 18:20:41 +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 21PIKf1Z001962; Fri, 25 Feb 2022 18:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21PIKfXj001961; Fri, 25 Feb 2022 18:20:41 GMT (envelope-from git) Date: Fri, 25 Feb 2022 18:20:41 GMT Message-Id: <202202251820.21PIKfXj001961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 1517b8d5a7f5 - main - vfs_unregister: fix error handling 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1517b8d5a7f58897200497811de1b18809c07d3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645813241; 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=Lm30aJfc7WLrKB+S/7Tly8mUh+arNe8VeK4SKEALVZY=; b=jvwvJANjX/fFVC9Z1IwfMHc7rXQehfAaQQEzG/VBD7KBXOwcqF4E1MP5CXJwQ68FHTZPAQ v8V7jHPrYem97j60zR2w7ytFgNLaJVhd3CeOvg/nnHVco1xQO17FBA7XCdc/xATbJFoq0Y A/6+s+u62QYSqJhpr1CD1CGb7oVeeTYcxHofmcBvNvnM+Cm1mpGrAng9N1zDiiRTS1MDY2 0kWnpQuuxKvRoeEz91L7L73jEX8MFFm4eUQlmnxgswEH8kmHLCzsMkTAkjx8OAbW1UKkAv Z4aH2qUfXhTA907usQpMyPzFmlbssPmybv7WCjFTv62qw1lhB05yKTa9zJ4g4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645813241; a=rsa-sha256; cv=none; b=NhKh1hWPNoneh6yoKw6Adn/gcgUXPbr/rfCmKxePbL1b84XgvElFjXBCj6FEkSu5d4f4nO zeZJSjTEQHDxJD5tM0z+EmKgTlOX4D7T+nYBGUKxDURilvGk/UjqajXM20hZKylTNcw+Wi HXYgsLpbRezkapgpPWhL/d5UBemVlctBti+ckjTleAZ6ZjRuR89uEOSQmvLancsh9Kqi7Z 9IjmxFae1KIiM/Bn7AfYfEIjAPgm0gm+Y4c9EUz1KoxCRNp8IS34e5bx4DhaabdgSSTUTh gSfWMg7ZSvoCIhDTjVbC+Oo8+mq0eKhwzgjIT7DHkHgRE2JA/ZJ3yjUmJP8J9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=1517b8d5a7f58897200497811de1b18809c07d3e commit 1517b8d5a7f58897200497811de1b18809c07d3e Author: Marvin Ma AuthorDate: 2022-02-25 15:34:33 +0000 Commit: Eric van Gyzen CommitDate: 2022-02-25 18:19:14 +0000 vfs_unregister: fix error handling Due to misplaced braces, an error from vfs_uninit() in the VFCF_SBDRY case was ignored. Reported by: Anton Rang Reviewed by: Anton Rang , markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34375 --- sys/kern/vfs_init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 112b4c76e575..612cc06a0db7 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -547,14 +547,13 @@ vfs_unregister(struct vfsconf *vfc) if (vfc->vfc_vfsops_sd->vfs_uninit != NULL) error = vfc->vfc_vfsops_sd->vfs_uninit(vfsp); } else { - if (vfc->vfc_vfsops->vfs_uninit != NULL) { + if (vfc->vfc_vfsops->vfs_uninit != NULL) error = vfc->vfc_vfsops->vfs_uninit(vfsp); } if (error != 0) { vfsconf_unlock(); return (error); } - } TAILQ_REMOVE(&vfsconf, vfsp, vfc_list); maxtypenum = VFS_GENERIC; TAILQ_FOREACH(vfsp, &vfsconf, vfc_list)