From nobody Fri Dec 13 14:06:00 2024 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 4Y8rj45Hsqz5gcSs; Fri, 13 Dec 2024 14:06:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8rj43ZQBz4fHD; Fri, 13 Dec 2024 14:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098760; 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=8eyrBVdyEVn7ivnDZkl/clZRWj3+qiJuUw2ObteoNUw=; b=Vye8sZgszvYc7Kh/I0RQRWtw2Oy/NVOiqI86ek4Udya1IQo0l3quq/3Un1CBm/6wh0vQHL OVPjj44JKd5i9enTWBO3HxSwQQH4P8lT8Tb7qw4MUbzSWnepDJyeQJBiTxXSilv9nKcrq3 7uDdGc8F03D/6SZCRvB+A0o2okidr8A8PuaoNQW4agI/dxE6Gh277ewWur8uCqEK1IvQSz 2VWfO30z9GdxY0q0phCNy7Zv97ok3WhpifcdVD/XW+4ybuMwuJ/JSGULWCeD+GI5B9a21g 4LRfcePmbJejw1Dndmr6HQrcXrvdbfUpXfsw0CqXwZMuVVLjd3sfhIcHY9g63w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734098760; 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=8eyrBVdyEVn7ivnDZkl/clZRWj3+qiJuUw2ObteoNUw=; b=UoUtu1TR/TzL33OnF8H2crmIrV+SzUibGurHFku3+6scBw84HNXKSo1a5GZeGUpSjAXpZb Hm+oPxOCZ4GCTCdBrduXs60i4TKZ8pdZfWKWg27oCiJsfK/vcWlXD+3L1vGG0wIP3uiW3D kG9Sqoiz10EcNKAg99SYPGv1Qjnv2bluvYZQXAMIkSNj86jwzefwPTuMZbLoAW+KaS/txt 4Fjrink8gUxLiT5AU1eiRZTr8aW+pOVEaPLsjjHipfCDprBk1t7vr1VAQZKlnTrPRQlfo+ 4ZIPxjRIf/ZeIkqyloqsbkk9QWrn033zKJxobdac8IV4AmT1mS4Uf0SwbHE+QA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734098760; a=rsa-sha256; cv=none; b=Y7a/zFQSIbbbaMIhSnhRr+gHrSsuxibpdzGa4vjxkORjtE4DuiEeZ2bnTxjdUTv5rGOov0 H0aI2e+AP0N4wjCoZP+v+HN6daySd1X/HDDbpOG7WEdvy3SlQNpnyZP9kk0z74631sJXEg RxiDOMuJgRzXH8JWkAnGqr8crMbN00KgJ9v3gPGikdiHxWz5q0aezRQRzFXas2OH3v26BS iNwpcIpSeqETnDjqqXZx4mr66Dw2uoiozDklRRjltRSArz5r7Vg6xIYRB0+vGeeU1751Wm ABA9jxeqN2wYO38E0ZJxq11jNmMTrV3HsFjPM4m8tNYlN14c30zjFhwRTTgOKw== 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 4Y8rj42CDRzgXM; Fri, 13 Dec 2024 14:06:00 +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 4BDE60FG023319; Fri, 13 Dec 2024 14:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDE60TV023316; Fri, 13 Dec 2024 14:06:00 GMT (envelope-from git) Date: Fri, 13 Dec 2024 14:06:00 GMT Message-Id: <202412131406.4BDE60TV023316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 8ae6247aa966 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8ae6247aa966989412bd75fc7c26728690b9e944 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae6247aa966989412bd75fc7c26728690b9e944 commit 8ae6247aa966989412bd75fc7c26728690b9e944 Author: Olivier Certner AuthorDate: 2024-12-06 16:37:56 +0000 Commit: Olivier Certner CommitDate: 2024-12-13 14:04:50 +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 --- 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 63102deb10b0..c45339bfde40 100644 --- a/sys/fs/ext2fs/inode.h +++ b/sys/fs/ext2fs/inode.h @@ -187,11 +187,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_ */