From nobody Wed Feb 4 17:29:23 2026 X-Original-To: dev-commits-src-main@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 4f5nQw3vC8z6FWJl for ; Wed, 04 Feb 2026 17:29:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f5nQq3HPrz3qHb for ; Wed, 04 Feb 2026 17:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770226163; 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=hiNWZZSJJ5zPIa+gAzRVQfgskuh6yFyaiAIcDf7KZbE=; b=UMafq8SjQc/YGxh0EhOeXJcyNP2ooZdVTz+1TjfMk2JA1L6w36WR3muvSnJ4gP+lyStWHK RNDXU+jw1WegR5iB770yaxDhGHfovS4XGe6iH4a8rS5m1dQS/ERPVlivMoBs7A6qdSxKrk jIJdpVPTJUbnFqEuMpCW6QsuIgAU6zo+27Jj70pXhsSDC4wsS7+QenwddgJioaFIA1SMGs A+GH7hNUae8XRxQFHr8Ui48W7grmk7hCnwZiO51HzvKI04/9MLz/ed/wVwPUU4x7X8aFFX mponkfbwKmaXxh06f6xvw+73drWY7sNjPnN22mSwtEsyskddu1UzT9g0XdM6Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770226163; a=rsa-sha256; cv=none; b=lhcizFYg5sUUK2xt8M9Apr5Sk0G0MH/wyYZHCpym8WLPiePxUBxyLLJPAPjkVvNvEJcC4c 29Jg0EZDLAMYfWUStPSYDoJm9ScYQbWyJDC/EKPa8R6+dlIc1Xphp1acNi5AH0c9uVLhvf LBsB1KFkjbM/HXUiuACw1DEq2y4r7SS5dIH5VR7BzEKglka3wYQTaJBb0j2MygJmn6/+47 k1vx5UWfIo7kFOXjA7l8942zVFhIteUCrLQ7frXEZjaH3oJjH/Z5w4a426UG/ckx1M+M9s V+Nxn6HyngmQZy+3RU46sNzPVErr9Gzd1dBsx6+3lUQdEqEL5fu33EZdlOM9ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770226163; 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=hiNWZZSJJ5zPIa+gAzRVQfgskuh6yFyaiAIcDf7KZbE=; b=hWDMXH/WwdMn6YYlIw7WBsqE9Eus2aIu2GDbe4j5iVCDckkblTbE2ooQhtRDyLINKYvRW8 JOliaN49PK3gYB3+lO81c/7PioAVk+3IEwHkRxXQAznAqbfQiqlaLLEjZdf23kmQbj8ay7 FgbhLKE8lPomczkBS77cuk40SFLmOvBUHhwvue2VStmTnLKRl/KmoBltsnlfAQgorYXDOT c7XQKw7jLFmMyuDEDnQmHohDCa5z4qtDIoAAjSJYVIgBG5joSFUoWh8iqLnu6hw3sB6eQM WYc0YZvdhABsLs8OIAJQIsQeW4O4NTGB1icFSiJtInapFW4pojW3AHY8joP7/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f5nQq2qDRz17HQ for ; Wed, 04 Feb 2026 17:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Feb 2026 17:29:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe8105de1485 - main - stand: Minor style tweaks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe8105de1485063a02ff25e686761247f78aaed9 Auto-Submitted: auto-generated Date: Wed, 04 Feb 2026 17:29:23 +0000 Message-Id: <698381f3.1d6a2.32ce4573@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe8105de1485063a02ff25e686761247f78aaed9 commit fe8105de1485063a02ff25e686761247f78aaed9 Author: Warner Losh AuthorDate: 2026-02-04 17:19:43 +0000 Commit: Warner Losh 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);