From nobody Thu Mar 03 14:20:45 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 9ABCA19E62AF; Thu, 3 Mar 2022 14:20:47 +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 4K8Y725Qv4z3LR1; Thu, 3 Mar 2022 14:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317247; 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=2f6EIByZlyZoTaPD1TmFv4k+ogFhZ1fzmYWI+Lxz9Ik=; b=Aa/OSE18kLOmTgNVpHM6vghzeH+A4PsTq86Mcs/KDzT0S6Ual5IeYZ+Fald6waI6gSkX+F DAMJ+/g2EjmRtOy6otOmEe9DodMQe6EhKeipgEP68cAHEqS1AOceN8lA2p1isqFmx6G6GG ZqAoHNg+TUSNLLaLwUQKEzEVmr7nwU4XYm4pGWkQoqB1txdVUMXnXfgQKun4wTw88L8Q/E 8av0+TIOWS0C66+h7y21amg3a6p9W7ZFPgDHP7ubaDqDk7tGwYxP61MTn4koRV+3TklBfF aFEJXfHZX4+DO8V6pwqtVb6LAt2YeIw+uwqjNs9hdQO4nn82WwbGZRqVnJ+0Cg== 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 F195418F4F; Thu, 3 Mar 2022 14:20:45 +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 223EKjHB090805; Thu, 3 Mar 2022 14:20:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223EKjbc090804; Thu, 3 Mar 2022 14:20:45 GMT (envelope-from git) Date: Thu, 3 Mar 2022 14:20:45 GMT Message-Id: <202203031420.223EKjbc090804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 769f1e79f58b - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 769f1e79f58b9202471bff75f1f79bcbc6d0a03c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317247; 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=2f6EIByZlyZoTaPD1TmFv4k+ogFhZ1fzmYWI+Lxz9Ik=; b=IXKYN7ErAGXjhUIse8quhnYPIguecEF4JdkLLhysQavj/gZeLPPGmYGJNIAC5g0kxRzHzY M0HzeSvEo4xV5zzVEO0RvnP85TtHH8wHgTP9MHwA72sN06IwXknluw4ITyiI+j1TGwCBQD tExSfd7ADRaT6gdnY9DfRQlosCpuc5XNsUWX0MdUPGTokmdPkYoFjwoArrWrX4kdFCQ27s 19hi3hCCoUt3mkZ0V3GOmIv1yEyQV1FYhZA8J/+D4E8TRQOMObym4FO5EKJdooUDvfbLAn 9vBFyiQh3YM4ngvHjdjX1U+9COJC2KiUEjqW7hIsSaPYR0uggdS+eh2jw15NSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646317247; a=rsa-sha256; cv=none; b=JQRatytkdgIi5NZ2S0uks3zceWCl6K97s0Lt7I8jw64jaBXbwCmnAcfiAf5SSx9FJwETVJ Tz14EzAVowyRixAu8CGwI73Hw0v3Ft1ZKgOn/6TAtWhY/tMKLHayrtBsF+DOIC/cyB9hzw ofKIaSBBfbgmzIy3yhAXE4mZcBGoEev/CXchqzRIuOX6fC2z8ZqkH8summ4NPekXpytdMp WrUL+7wYh/3y2qoaim47ZLygWdpP3EOUFXmb+sX8XrkgS2mU/mIpyYgVBjrt0b/dFRd6Cw siaV4uAbSU+ertlyiEqCJKVaq+LZku6h86yiercfmKdJpfy/PBwhoVl0t+dIDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=769f1e79f58b9202471bff75f1f79bcbc6d0a03c commit 769f1e79f58b9202471bff75f1f79bcbc6d0a03c Author: Marvin Ma AuthorDate: 2022-02-25 15:34:33 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-03 14:20:08 +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 (cherry picked from commit 1517b8d5a7f58897200497811de1b18809c07d3e) --- 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 3365ddb11474..e22a9561305d 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -545,14 +545,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)