From nobody Tue Aug 16 18:22:07 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 4M6fcv4PnPz4Z5FX; Tue, 16 Aug 2022 18:22:07 +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 4M6fcv404nz46T3; Tue, 16 Aug 2022 18:22:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660674127; 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=rHLdgMp3wqWJQH3dm4w8BaT1QyJYoMMHdcUatnqzhSI=; b=heWjXAbyw3MQVHvX5N2njj+oGVuRN9PnDrN/xLDsPPo85lrdtp37Hg+zEqVUp0TwYLu8WT 3yxSfwdoIrfIyCk0rXJEU9SnvpufmqzzmckL/L/nC9V5ruKh8lJPae0VDAwEf40a+ZggTv HUvyagCuTA7m2Aii28XYl2+Wgr8TLS7y++BOsz3YsVsxyT3TLYbecANMzMSsWfwDuwXc2Y DZQuFKJd3xHo0CjVU+HLDeH12DZL5VlIGPEd0VgcSu2veN/8g6Z1rLVY5okfMzYy/Lj00C 66unSnyiubDtWFo2Fo/L76v8E30QZr9T/pYz1yD5850xUPvqE77OQa9RVkh8Iw== 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 4M6fcv32v6zK1j; Tue, 16 Aug 2022 18:22:07 +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 27GIM7eP028680; Tue, 16 Aug 2022 18:22:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27GIM7Ie028679; Tue, 16 Aug 2022 18:22:07 GMT (envelope-from git) Date: Tue, 16 Aug 2022 18:22:07 GMT Message-Id: <202208161822.27GIM7Ie028679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c4d26f027be3 - main - makefs: Style 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4d26f027be34252702e0b18c3220c5a6db3cb86 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660674127; 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=rHLdgMp3wqWJQH3dm4w8BaT1QyJYoMMHdcUatnqzhSI=; b=CFkB3/x7+WMFOt7OURwNAZBKAR5x3ytb8nYwKILUkxetUALWGUy5UqatgZAAwSb3oh2Zo+ MtpUUNmagsE3DczQaqu/Ipab4LiP4gHu1RopSRSYTDlWn1KDind7EpCUoorUIXfwNjJNM3 v+29d4jR2Mh6sof0b1+OoUm4HN+cncP18Pjv4CFqnMkLdq8CItEtON86yPE9UPSNCiahaa 8EBEj5Hea1ee2XLUQ+TkUTjccrQ/Lc4E8H0f7pqFBPQrQOYz8mIRndXmjum2WZL5M3yq/1 XeveDwI1huDtWtjLXTZLqqvTsVKvI0mlsSh7PTVToBvsVzlNzNsu7s5VCFnatA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660674127; a=rsa-sha256; cv=none; b=BaNHokIeSaADiU9ZQgUNonEmtcWReFj2kxL8VIa2VkV0eb1KKVE4RiBKrmQTv3NI5oPRJA j313VKI0H3wZxiS19JPvoN0wYTjeKn+8obtAKs1wZ8u6LjImNIMlHcOLkM5Dnh7wAQS1tI rk1XAgU1NzjUKIMQRlexcMGH8LS1NQvL26PSRmK0OTCUsMlFE/wwLG7xUmRWE7WUGPc722 qjpamHn9oZX9RdtGOqXhtXYlvG7Tj+kYgQK2NMooAPHGNiGeK1ZkN69ZRA/Mdxv0CP3KDa 7kJt5x7h71Fl2u3rKbGhh4ECtqUSNcdHbJf/Qu/emRMRslLP7E5NeYfz3LVHjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c4d26f027be34252702e0b18c3220c5a6db3cb86 commit c4d26f027be34252702e0b18c3220c5a6db3cb86 Author: Mark Johnston AuthorDate: 2022-08-16 17:07:46 +0000 Commit: Mark Johnston CommitDate: 2022-08-16 18:21:44 +0000 makefs: Style Reported by: rpokala Fixes: 187084dddd3e ("makefs: Align the block buffer used in ZFS mode") Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/makefs/zfs.c b/usr.sbin/makefs/zfs.c index ab6011046b22..4e8c94afb0de 100644 --- a/usr.sbin/makefs/zfs.c +++ b/usr.sbin/makefs/zfs.c @@ -70,10 +70,11 @@ struct dnode_cursor { void zfs_prep_opts(fsinfo_t *fsopts) { + zfs_opt_t *zfs; size_t align; align = alignof(uint64_t); - zfs_opt_t *zfs = aligned_alloc(align, roundup2(sizeof(*zfs), align)); + zfs = aligned_alloc(align, roundup2(sizeof(*zfs), align)); if (zfs == NULL) err(1, "aligned_alloc"); memset(zfs, 0, sizeof(*zfs));