Commit bd29881a authored by Baokun Li's avatar Baokun Li Committed by Theodore Ts'o
Browse files

ext4: pack holes in ext4_inode_info 



When CONFIG_DEBUG_SPINLOCK is not enabled (general case), there are four
4 bytes holes and one 2 bytes hole in struct ext4_inode_info. Move the
members to pack the four 4 bytes holes.

Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250122110533.4116662-10-libaokun@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5a1cd0e9

fs/ext4/ext4.h

+3 −4
Original line number Diff line number Diff line
@@ -1064,6 +1064,8 @@ struct ext4_inode_info { 
	/* Number of ongoing updates on this inode */

	atomic_t  i_fc_updates;



	spinlock_t i_raw_lock;	/* protects updates to the raw inode */



	/* Fast commit wait queue for this inode */

	wait_queue_head_t i_fc_wait;
@@ -1101,8 +1103,6 @@ struct ext4_inode_info { 
	struct inode vfs_inode;

	struct jbd2_inode *jinode;



	spinlock_t i_raw_lock;	/* protects updates to the raw inode */



	/*

	 * File creation time. Its function is same as that of

	 * struct timespec64 i_{a,c,m}time in the generic inode.
@@ -1145,6 +1145,7 @@ struct ext4_inode_info { 
	/* quota space reservation, managed internally by quota code */

	qsize_t i_reserved_quota;

#endif

	spinlock_t i_block_reservation_lock;



	/* Lock protecting lists below */

	spinlock_t i_completed_io_lock;
@@ -1155,8 +1156,6 @@ struct ext4_inode_info { 
	struct list_head i_rsv_conversion_list;

	struct work_struct i_rsv_conversion_work;



	spinlock_t i_block_reservation_lock;



	/*

	 * Transactions that contain inode's metadata needed to complete

	 * fsync and fdatasync, respectively.