From: Li Lingfeng <lilingfeng3@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I53Q6M CVE: NA --------------------------- Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com> Reviewed-by: Yang Erkun <yangerkun@huawei.com> Reviewed-by: Hou Tao <houtao1@huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com> --- include/linux/fs.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index a8e36afa66b0..6363c0a67af5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -462,11 +462,10 @@ struct request_queue; struct block_device { dev_t bd_dev; /* not a kdev_t - it's a search key */ int bd_openers; + int bd_write_openers; struct inode * bd_inode; /* will die */ struct super_block * bd_super; struct mutex bd_mutex; /* open/close mutex */ - int bd_write_openers; - int bd_part_write_openers; void * bd_claiming; void * bd_holder; int bd_holders; @@ -498,7 +497,11 @@ struct block_device { /* Mutex for freeze */ struct mutex bd_fsfreeze_mutex; +#ifndef __GENKSYMS__ + int bd_part_write_openers; +#else KABI_RESERVE(1) +#endif KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) -- 2.25.1