From nobody Fri Jan 17 13:53:12 2025 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 4YZLm85kSGz5l1Nb; Fri, 17 Jan 2025 13:53:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZLm81zbMz3nVL; Fri, 17 Jan 2025 13:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121992; 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=ENucwjJtxm7ru5zcnIv1f4qJ83OhaD0qCCQKSdEkNww=; b=EalTxmxXRaPhMzST+nTlMrmNRnsEI4i22GT5jAlzSdSmandka7tKKgY3E28izhkakyUgWl +T9v+KiernwMLvFHEJSwISIi8gyD5eAl+M5Gc0MNbGcz+rPau/pG0IPzKH0oW+eL6lzrx2 zH40xvyDTvmzTiM42GSrb7JevoCszEvO3gSJVyLoc1Hid2ThHYey3lqvgnDGh5TWxWAQJm lQpNa49P0ir8GSNWrmMAsdZMwASLEmf4B3Ke0drZz/dw78q0Ie3PM8e7UJ2S2JEHlWG21/ L9Pwy+h9lxZq6qmj+T0WvujWBv//ltFt+tHwCKgh3CAka7AKFMCfPYsSwWel7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121992; 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=ENucwjJtxm7ru5zcnIv1f4qJ83OhaD0qCCQKSdEkNww=; b=nT+FCAJEWIuyrs7XFYzT87szNhGftS5Rxs5q/A98AgTb52pS3qGtXbFDGmjNZ9aAYZFXHB kU0qB5DBXG5jxwjEuM4YYJK3/EyPcWrxDUFdQCwRmp/4mkqXoNGjjZcy4lV2P9guTWNN5U RoToyBYTXSGJEIkbkAaj3TxLQtMzSgkajOZ7NWrXro1LmiTcv8STr460x8+6JpA+HJw/+i 0/q+UlGmo9eczThSKMcGaUfKY7pDecixL68A1m6OEEtOYZjJqw6Nm0Q1zgE5JtoVRLo3g9 3gNL6m/9MEVbe2+1P59JKvFSRve4MLmVwW+tu5Z2cD4ZBwhA9ZYU8nyuxpWcfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737121992; a=rsa-sha256; cv=none; b=dmrbPlTD/7wEbCV2aEVhCu1lUx9s+XYujzBypLzk8cTOAcxvJ628zREQaoT07a1D/PJe4q /jXILh5Xj+0jCpq85kP+uTj9UxjPb7pLu5sdJWZKrQd7f5thT69hDZFHFQXsTwPXNthQ+c dHb1v6hVDMp51J4O59LT3RoyUBxBKChMkKDR8RC0cQykhfrWZFn6fUjeFR+KW1kaH+9PFj i0nYz7QwPvtOH84EolESyEdl8JRyPlOsAyCFtoF55OyAy2WE34wYVDOL4Fy/XILTNiCcaU pQTMTAdeYOesHDwt3XmWGq7Q0KX5Hdzp3b6vqawrZPECq4CUdxkpzxzq3qkVGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZLm81ZHpz5b7; Fri, 17 Jan 2025 13:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50HDrCDt022615; Fri, 17 Jan 2025 13:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HDrCij022612; Fri, 17 Jan 2025 13:53:12 GMT (envelope-from git) Date: Fri, 17 Jan 2025 13:53:12 GMT Message-Id: <202501171353.50HDrCij022612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6b1a5d3535d9 - stable/14 - ext2fs: 'struct ufid': Re-order fields and unpack 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b1a5d3535d9211279667cec62c507caa001a410 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6b1a5d3535d9211279667cec62c507caa001a410 commit 6b1a5d3535d9211279667cec62c507caa001a410 Author: Olivier Certner AuthorDate: 2024-12-06 16:37:56 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 13:51:54 +0000 ext2fs: 'struct ufid': Re-order fields and unpack Re-ordering the fields suppresses the trailing padding which was causing the structure to overflow 'struct fid'. While here, re-indent in a more visually pleasing way. Reviewed by: rmacklem, emaste, markj Approved by: markj (mentor) MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D47955 (cherry picked from commit 8ae6247aa966989412bd75fc7c26728690b9e944) Sponsored by: The FreeBSD Foundation --- sys/fs/ext2fs/inode.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/fs/ext2fs/inode.h b/sys/fs/ext2fs/inode.h index 14d2d6454737..4c7ee0789529 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -189,11 +189,11 @@ struct indir { /* This overlays the fid structure (see mount.h). */ struct ufid { - uint16_t ufid_len; /* Length of structure. */ - uint16_t ufid_pad; /* Force 32-bit alignment. */ - ino_t ufid_ino; /* File number (ino). */ - uint32_t ufid_gen; /* Generation number. */ -} __packed; + uint16_t ufid_len; /* Length of structure. */ + uint16_t ufid_pad; /* Force 32-bit alignment. */ + uint32_t ufid_gen; /* Generation number. */ + ino_t ufid_ino; /* File number (ino). */ +}; #endif /* _KERNEL */ #endif /* !_FS_EXT2FS_INODE_H_ */