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

!4343 v3 reserve KABI slots for file system or storage related structures 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6BUOPVSM4NORVY34DB7DECDAN7VQ4EJZ/ 
Reserve kabi slots for the following structures:

- export_operations
- pipe_inode_info
- mtd_info
- mtd_part_parser_data
- mtd_partition

V2:
  pipe_inode_info       -- 2 reservations -> 3 reservations
  mtd_info              -- 2 reservations -> 4 reservations
  mtd_part_parser_data  -- 2 reservations -> 3 reservations

V3:
  The reserved macro index of the kabi starts from 1

ZhaoLong Wang (3):
  exportfs: kabi: Reserve KABI slots for export_operations structure
  pipe: kabi: Reserve KABI slots for pipe_inode_info structure
  mtd: kabi: Reserve KABI slots for mtd_device_xxx_register() related
    structures


-- 
2.34.3
 
https://gitee.com/openeuler/kernel/issues/I8ZTLZ
https://gitee.com/openeuler/kernel/issues/I8ZSV8
https://gitee.com/openeuler/kernel/issues/I8ZUFD 
 
Link:https://gitee.com/openeuler/kernel/pulls/4343

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 29efdd23 be413fc7

include/linux/exportfs.h

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define LINUX_EXPORTFS_H 1



#include <linux/types.h>

#include <linux/kabi.h>



struct dentry;

struct iattr;
@@ -225,6 +226,8 @@ struct export_operations { 
						*/

#define EXPORT_OP_FLUSH_ON_CLOSE	(0x20) /* fs flushes file data on close */

	unsigned long	flags;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



extern int exportfs_encode_inode_fh(struct inode *inode, struct fid *fid,

include/linux/mtd/mtd.h

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/device.h>

#include <linux/of.h>

#include <linux/nvmem-provider.h>

#include <linux/kabi.h>



#include <mtd/mtd-abi.h>
@@ -398,6 +399,10 @@ struct mtd_info { 


	struct mtd_part part;

	struct mtd_master master;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



static inline struct mtd_info *mtd_get_master(struct mtd_info *mtd)

include/linux/mtd/partitions.h

+6 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define MTD_PARTITIONS_H



#include <linux/types.h>



#include <linux/kabi.h>



/*

 * Partition definition structure:
@@ -51,6 +51,8 @@ struct mtd_partition { 
	uint32_t mask_flags;		/* master MTD flags to mask out for this partition */

	uint32_t add_flags;		/* flags to add to the partition */

	struct device_node *of_node;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

};



#define MTDPART_OFS_RETAIN	(-3)
@@ -68,6 +70,9 @@ struct device_node; 
 */

struct mtd_part_parser_data {

	unsigned long origin;

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};

include/linux/pipe_fs_i.h

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _LINUX_PIPE_FS_I_H

#define _LINUX_PIPE_FS_I_H



#include <linux/kabi.h>



#define PIPE_DEF_BUFFERS	16



#define PIPE_BUF_FLAG_LRU	0x01	/* page is on the LRU */
@@ -80,6 +82,9 @@ struct pipe_inode_info { 
#ifdef CONFIG_WATCH_QUEUE

	struct watch_queue *watch_queue;

#endif

	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

};



/*