Unverified Commit 8d4e9be5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4500 fs: kabi: KABI reservation for vfs 

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

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents b2a48d47 29465465

include/linux/buffer_head.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ struct buffer_head { 
	spinlock_t b_uptodate_lock;	/* Used by the first bh in a page, to

					 * serialise IO completion of other

					 * buffers in the page */

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};



/*

include/linux/fs.h

+32 −0
Original line number Diff line number Diff line
@@ -1774,6 +1774,9 @@ struct renamedata { 
	struct dentry *new_dentry;

	struct inode **delegated_inode;

	unsigned int flags;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

} __randomize_layout;



int vfs_rename(struct renamedata *);
@@ -1928,6 +1931,14 @@ struct file_operations { 
	int (*uring_cmd)(struct io_uring_cmd *ioucmd, unsigned int issue_flags);

	int (*uring_cmd_iopoll)(struct io_uring_cmd *, struct io_comp_batch *,

				unsigned int poll_flags);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

} __randomize_layout;



/* Wrap a directory iterator that needs exclusive inode access */
@@ -1978,6 +1989,15 @@ struct inode_operations { 
			    struct dentry *dentry, struct fileattr *fa);

	int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);

	struct offset_ctx *(*get_offset_ctx)(struct inode *inode);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

} ____cacheline_aligned;



static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio,
@@ -2061,6 +2081,13 @@ struct super_operations { 
	long (*free_cached_objects)(struct super_block *,

				    struct shrink_control *);

	void (*shutdown)(struct super_block *sb);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

};



/*
@@ -2360,6 +2387,11 @@ struct file_system_type { 
	struct lock_class_key i_mutex_key;

	struct lock_class_key invalidate_lock_key;

	struct lock_class_key i_mutex_dir_key;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)

include/linux/fs_context.h

+6 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ struct fs_context { 
	bool			global:1;	/* Goes into &init_user_ns */

	bool			oldapi:1;	/* Coming from mount(2) */

	bool			exclusive:1;    /* create new superblock, reject existing one */



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



struct fs_context_operations {
@@ -119,6 +122,9 @@ struct fs_context_operations { 
	int (*parse_monolithic)(struct fs_context *fc, void *data);

	int (*get_tree)(struct fs_context *fc);

	int (*reconfigure)(struct fs_context *fc);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/*

include/linux/fs_parser.h

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ struct fs_parameter_spec { 
#define fs_param_can_be_empty	0x0004	/* "xxx=" is allowed */

#define fs_param_deprecated	0x0008	/* The param is deprecated */

	const void		*data;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



/*