From nobody Fri Jan 17 14:00:41 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 4YZLwn4J9Mz5l1fJ; Fri, 17 Jan 2025 14:00:41 +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 4YZLwn3Fszz3q94; Fri, 17 Jan 2025 14:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737122441; 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=27fsh5d65+iI0+0xLU8zEvB8GNMJ/CS5aKm+IoF2bB4=; b=abXnMeSKTEryxw5D5N6tYSn035Kh0kDn8WV76dsvn9YCXMzXWwEpmfGna+oDBdnXsyHA43 9De4AreYlYhPsCuB/lyqIPzrPt1sUzJn9AtECu07Cq3MTKpljxDByhsGPj5YGn/rQMX4cW rNNo8TGsM/DKrtaFTqu/mqXHdbOUCIIN80YLgYVTDku56M8hSa6PH3fpermYVg/UvQ37jN XUPTlJdlYM1alu7sLdXapBExFFuN54zjs3Y1yxmPcJqrwHX9Il/FpUgXIgarwlsuG/qUiw aoFvZ8lOPp8FwPJs5tDsKwrwIbtUH+EChQ1fM+sw4eVywRg0OnoM5tWfw+zMrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737122441; 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=27fsh5d65+iI0+0xLU8zEvB8GNMJ/CS5aKm+IoF2bB4=; b=LiPYKU7OkMdPYE5o+z1U4+U+++9w8uCR4hicwcbvZU8/utIHDCpSSur8l9K+4PJTduJGwd WJ5zx/IEekGpzymYtdBlHPruwI1u1LaS4Sg3PmK5VsmO3p+uNpAtW5zZgQvy/VYLliXX7v PnHNvTlsDXa4OpAqq4ylJhIv859Ks/9MWxQzuXenrbuQz8cO2G36ZN5R+Q3LHuGBIIo/+w I0cxT9ajHIv9vnrJEEgKBaRX4mI1KuIWU6x4ZlTo306o7G41+ihkxlEFnjMUgmmDcrTkj+ AU9kLmu5SCaPcQ6aLpxGErNaRhDZTydyI00HukNX8M+yl2Z7jYcPPuUHnn72mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737122441; a=rsa-sha256; cv=none; b=AEHDGGH5ateSYFlhS24xkIn4LNqkQ6pJ3g5I5rXxgjzRrjF829cphc9gaw89bPntZRtw5p iRHzH10w3ynwYHJ3Fto/VpqkHpbBQDMem27SKlaqJb/13D7dRW22a4zCc5DL34zJsJ6p9T CA5VhUNiqe7EAk18ms0qv4foTE7nICJpgQaFxqH/rn3uCkpjVpv5oelx9otEMh+uRArjMK gCJblbw+sOWXVnFfhVf3UZh5gE1aK3raNc046SzbRdTAQUTJ1nbJrwkMkLQ/MpcM9NMg0L DG5eoaON+Fh08jGTRWC3HIHa8VVlPOD9bEJ7BRbBnUYxXrQt+cQbkwNgoflhfQ== 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 4YZLwn2gDlz5Kl; Fri, 17 Jan 2025 14:00:41 +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 50HE0fkr034758; Fri, 17 Jan 2025 14:00:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HE0fc2034755; Fri, 17 Jan 2025 14:00:41 GMT (envelope-from git) Date: Fri, 17 Jan 2025 14:00:41 GMT Message-Id: <202501171400.50HE0fc2034755@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: acdc59f0924a - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: acdc59f0924aaddfa321741af05e08d2a6715d1a Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=acdc59f0924aaddfa321741af05e08d2a6715d1a commit acdc59f0924aaddfa321741af05e08d2a6715d1a Author: Olivier Certner AuthorDate: 2024-12-06 16:37:56 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 13:59:53 +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 c29a64be12e0..225a8b0d0901 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -185,11 +185,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_ */