git: 769f1e79f58b - stable/13 - vfs_unregister: fix error handling

From: Eric van Gyzen <vangyzen_at_FreeBSD.org>
Date: Thu, 03 Mar 2022 14:20:45 UTC
The branch stable/13 has been updated by vangyzen:

URL: https://cgit.FreeBSD.org/src/commit/?id=769f1e79f58b9202471bff75f1f79bcbc6d0a03c

commit 769f1e79f58b9202471bff75f1f79bcbc6d0a03c
Author:     Marvin Ma <marvin.ma@dell.com>
AuthorDate: 2022-02-25 15:34:33 +0000
Commit:     Eric van Gyzen <vangyzen@FreeBSD.org>
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 <rang@acm.org>
    Reviewed by:    Anton Rang <rang@acm.org>, 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)