git: fe8105de1485 - main - stand: Minor style tweaks

The branch main has been updated by imp:

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

commit fe8105de1485063a02ff25e686761247f78aaed9
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2026-02-04 17:19:43 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2026-02-04 17:29:11 +0000

    stand: Minor style tweaks
    
    re-wrap the function calls in a couple of ifs in get_zfs_root so they
    are more readable. They really didn't need to be wrapped like this in
    the first place.
    
    Sponsored by:           Netflix
---
 stand/libsa/zfs/zfsimpl.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c
index e5920004bd9d..ebeb7bea7041 100644
--- a/stand/libsa/zfs/zfsimpl.c
+++ b/stand/libsa/zfs/zfsimpl.c
@@ -651,8 +651,7 @@ vdev_indirect_remap(vdev_t *vd, uint64_t offset, uint64_t asize, void *arg)
 				list_insert_head(&stack, o);
 			}
 			vdev_indirect_gather_splits(rs->rs_split_offset, dst_v,
-			    dst_offset + inner_offset,
-			    inner_size, arg);
+			    dst_offset + inner_offset, inner_size, arg);
 
 			/*
 			 * vdev_indirect_gather_splits can have memory
@@ -3468,8 +3467,7 @@ zfs_get_root(const spa_t *spa, uint64_t *objid)
 	/*
 	 * Start with the MOS directory object.
 	 */
-	if (objset_get_dnode(spa, spa->spa_mos,
-	    DMU_POOL_DIRECTORY_OBJECT, &dir)) {
+	if (objset_get_dnode(spa, spa->spa_mos, DMU_POOL_DIRECTORY_OBJECT, &dir)) {
 		printf("ZFS: can't read MOS object directory\n");
 		return (EIO);
 	}
@@ -3477,19 +3475,17 @@ zfs_get_root(const spa_t *spa, uint64_t *objid)
 	/*
 	 * Lookup the pool_props and see if we can find a bootfs.
 	 */
-	if (zap_lookup(spa, &dir, DMU_POOL_PROPS,
-	    sizeof(props), 1, &props) == 0 &&
+	if (zap_lookup(spa, &dir, DMU_POOL_PROPS, sizeof(props), 1, &props) == 0 &&
 	    objset_get_dnode(spa, spa->spa_mos, props, &propdir) == 0 &&
-	    zap_lookup(spa, &propdir, "bootfs",
-	    sizeof(bootfs), 1, &bootfs) == 0 && bootfs != 0) {
+	    zap_lookup(spa, &propdir, "bootfs", sizeof(bootfs), 1, &bootfs) == 0 &&
+	    bootfs != 0) {
 		*objid = bootfs;
 		return (0);
 	}
 	/*
 	 * Lookup the root dataset directory
 	 */
-	if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET,
-	    sizeof(root), 1, &root) ||
+	if (zap_lookup(spa, &dir, DMU_POOL_ROOT_DATASET, sizeof(root), 1, &root) ||
 	    objset_get_dnode(spa, spa->spa_mos, root, &dir)) {
 		printf("ZFS: can't find root dsl_dir\n");
 		return (EIO);