Unverified Commit 40f62c4f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4554 v3 kabi: Reserve KABI slots for fs module 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NI5SAGTJSOBTMNDSJX4BGECUDDBVFFSB/ 
Add KABI slots for fs module struct.

Long Li (8):
  fscrypt: kabi: Reserve KABI slots for fscrypt_operations struct
  fanotify: kabi: Reserve KABI slots for fsnotify_* struct
  kernfs: kabi: Reserve KABI slots for kernfs_* struct
  xattr: kabi: Reserve KABI slots for xattr_handler struct
  fs: kabi: Reserve KABI slots for nameidata struct
  dax: kabi: Reserve KABI slots for dax_* struct
  profs: kabi: Reserve KABI slots for proc_ops struct
  sysfs: kabi: Reserve KABI slots for bin_attribute struct


-- 
2.31.1
 
https://gitee.com/openeuler/kernel/issues/I905SE 
 
Link:https://gitee.com/openeuler/kernel/pulls/4554

 

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

drivers/dax/super.c

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,15 @@ struct dax_device { 
	const struct dax_operations *ops;

	void *holder_data;

	const struct dax_holder_operations *holder_ops;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



static dev_t dax_devt;

fs/kernfs/file.c

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ struct kernfs_open_node { 
	struct list_head	files; /* goes through kernfs_open_file.list */

	unsigned int		nr_mmapped;

	unsigned int		nr_to_release;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};



/*

fs/kernfs/kernfs-internal.h

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ struct kernfs_root { 
	struct rw_semaphore	kernfs_rwsem;

	struct rw_semaphore	kernfs_iattr_rwsem;

	struct rw_semaphore	kernfs_supers_rwsem;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

};



/* +1 to avoid triggering overflow warning when negating it */

fs/namei.c

+2 −0
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ struct nameidata { 
	int		dfd;

	vfsuid_t	dir_vfsuid;

	umode_t		dir_mode;



	KABI_RESERVE(1)

} __randomize_layout;



#define ND_ROOT_PRESET 1

include/linux/dax.h

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ struct dax_operations { 
	 */

	size_t (*recovery_write)(struct dax_device *dax_dev, pgoff_t pgoff,

			void *addr, size_t bytes, struct iov_iter *iter);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



struct dax_holder_operations {
@@ -53,6 +58,10 @@ struct dax_holder_operations { 
	 */

	int (*notify_failure)(struct dax_device *dax_dev, u64 offset,

			u64 len, int mf_flags);



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};



#if IS_ENABLED(CONFIG_DAX)