From 813b68cf3e5122ef7102ddfe17da685902f66644 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 18 May 2023 23:24:04 +0200 Subject: [PATCH 390/406] Revert "f2fs: fix unaligned field offset in 32-bits platform" This reverts commit 5f823df27a9709a1ec50e6c54f1257af12b19d53. --- fs/f2fs/f2fs.h | 6 +++--- fs/f2fs/gc.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 305a056e2157..620343c65ab6 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -349,7 +349,7 @@ struct discard_info { block_t lstart; /* logical start address */ block_t len; /* length */ block_t start; /* actual start address in dev */ -} __packed; +}; struct discard_cmd { struct rb_node rb_node; /* rb node located in rb-tree */ @@ -361,7 +361,7 @@ struct discard_cmd { }; struct discard_info di; /* discard info */ - } __packed; + }; struct list_head list; /* command list */ struct completion wait; /* compleation */ struct block_device *bdev; /* bdev */ @@ -660,7 +660,7 @@ struct extent_info { unsigned long long last_blocks; }; }; -} __packed; +}; struct extent_node { struct rb_node rb_node; /* rb node located in rb-tree */ diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h index 304937d9a084..15bd1d680f67 100644 --- a/fs/f2fs/gc.h +++ b/fs/f2fs/gc.h @@ -58,7 +58,7 @@ struct gc_inode_list { struct victim_info { unsigned long long mtime; /* mtime of section */ unsigned int segno; /* section No. */ -} __packed; +}; struct victim_entry { struct rb_node rb_node; /* rb node located in rb-tree */ @@ -68,7 +68,7 @@ struct victim_entry { unsigned int segno; /* segment No. */ }; struct victim_info vi; /* victim info */ - } __packed; + }; struct list_head list; }; -- 2.34.1