Unverified Commit 233a023a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4528 v3 jbd2: kabi: KABI reservation for jbd2 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HNLZ3XMV3ZLQJEBBHCAESYOZW6QKSBDG/ 
 
https://gitee.com/openeuler/kernel/issues/I918VT 
 
Link:https://gitee.com/openeuler/kernel/pulls/4528

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 152836ec 0ce8f233

include/linux/jbd2.h

+23 −0
Original line number Diff line number Diff line
@@ -443,6 +443,9 @@ struct jbd2_inode { 
	 * ends. [j_list_lock]

	 */

	loff_t i_dirty_end;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct jbd2_revoke_table_s;
@@ -501,6 +504,8 @@ struct jbd2_journal_handle 
	unsigned int		h_requested_credits;



	unsigned int		saved_alloc_context;



	KABI_RESERVE(1)

};
@@ -512,6 +517,9 @@ struct transaction_chp_stats_s { 
	__u32			cs_forced_to_close;

	__u32			cs_written;

	__u32			cs_dropped;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/* The transaction_t type is the guts of the journaling mechanism.  It
@@ -706,6 +714,11 @@ struct transaction_s 
	 * structures associated with the transaction

	 */

	struct list_head	t_private_list;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct transaction_run_stats_s {
@@ -1291,6 +1304,13 @@ struct journal_s 
	 * VFS bmap function.

	 */

	int (*j_bmap)(struct journal_s *journal, sector_t *block);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

};



#define jbd2_might_wait_for_commit(j) \
@@ -1464,6 +1484,9 @@ struct jbd2_buffer_trigger_type { 
	 */

	void (*t_abort)(struct jbd2_buffer_trigger_type *type,

			struct buffer_head *bh);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



extern void jbd2_buffer_frozen_trigger(struct journal_head *jh,

include/linux/journal-head.h

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ struct journal_head { 


	/* Trigger type for the committing transaction's frozen data */

	struct jbd2_buffer_trigger_type *b_frozen_triggers;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



#endif		/* JOURNAL_HEAD_H_INCLUDED */