2019-08-30 03:38:51

by Gao Xiang

Subject: [PATCH v3 4/7] erofs: kill __packed for on-disk structures

As Christoph claimed "Please don't add __packed" [1],
I have to remove all __packed except struct erofs_dirent here.

Note that all on-disk fields except struct erofs_dirent
(12 bytes with a 8-byte nid) in EROFS are naturally aligned.

[1] https://lore.kernel.org/lkml/[email protected]/
Reported-by: Christoph Hellwig <[email protected]>
Signed-off-by: Gao Xiang <[email protected]>
---
no change.

fs/erofs/erofs_fs.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/fs/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h
index fbdaf873d736..b07984a17f11 100644
--- a/fs/erofs/erofs_fs.h
+++ b/fs/erofs/erofs_fs.h
@@ -37,7 +37,7 @@ struct erofs_super_block { /* off description */
__le32 requirements; /* 80 (aka. feature_incompat) */

__u8 reserved2[44]; /* 84 */
-} __packed; /* 128 bytes */
+}; /* 128 bytes */

/*
* erofs inode data mapping:
@@ -89,12 +89,12 @@ struct erofs_inode_v1 { /* off description */

/* for device files, used to indicate old/new device # */
__le32 rdev;
- } i_u __packed;
+ } i_u;
__le32 i_ino; /* 20 only used for 32-bit stat compatibility */
__le16 i_uid; /* 24 */
__le16 i_gid; /* 26 */
__le32 i_reserved2; /* 28 */
-} __packed; /* 32 bytes */
+}; /* 32 bytes */

/* 32 bytes on-disk inode */
#define EROFS_INODE_LAYOUT_V1 0
@@ -116,7 +116,7 @@ struct erofs_inode_v2 { /* off description */

/* for device files, used to indicate old/new device # */
__le32 rdev;
- } i_u __packed;
+ } i_u;

/* only used for 32-bit stat compatibility */
__le32 i_ino; /* 20 only used for 32-bit stat compatibility */
@@ -127,7 +127,7 @@ struct erofs_inode_v2 { /* off description */
__le32 i_ctime_nsec; /* 40 */
__le32 i_nlink; /* 44 */
__u8 i_reserved2[16]; /* 48 */
-} __packed; /* 64 bytes */
+}; /* 64 bytes */

#define EROFS_MAX_SHARED_XATTRS (128)
/* h_shared_count between 129 ... 255 are special # */
@@ -149,7 +149,7 @@ struct erofs_xattr_ibody_header {
__u8 h_shared_count;
__u8 h_reserved2[7];
__le32 h_shared_xattrs[0]; /* shared xattr id array */
-} __packed;
+};

/* Name indexes */
#define EROFS_XATTR_INDEX_USER 1
@@ -166,7 +166,7 @@ struct erofs_xattr_entry {
__le16 e_value_size; /* size of attribute value */
/* followed by e_name and e_value */
char e_name[0]; /* attribute name */
-} __packed;
+};

static inline unsigned int erofs_xattr_ibody_size(__le16 d_icount)
{
@@ -272,8 +272,8 @@ struct z_erofs_vle_decompressed_index {
* [1] - pointing to the tail cluster
*/
__le16 delta[2];
- } di_u __packed; /* 8 bytes */
-} __packed;
+ } di_u; /* 8 bytes */
+};

#define Z_EROFS_VLE_LEGACY_INDEX_ALIGN(size) \
(round_up(size, sizeof(struct z_erofs_vle_decompressed_index)) + \
--
2.17.1

2019-08-30 06:18:47

by Chao Yu

Subject: Re: [PATCH v3 4/7] erofs: kill __packed for on-disk structures

On 2019/8/30 11:36, Gao Xiang wrote:
> As Christoph claimed "Please don't add __packed" [1],
> I have to remove all __packed except struct erofs_dirent here.
>
> Note that all on-disk fields except struct erofs_dirent
> (12 bytes with a 8-byte nid) in EROFS are naturally aligned.
>
> [1] https://lore.kernel.org/lkml/[email protected]/
> Reported-by: Christoph Hellwig <[email protected]>
> Signed-off-by: Gao Xiang <[email protected]>

Reviewed-by: Chao Yu <[email protected]>

Thanks,