提交 4ad3e08b 编写于 作者: Z Zhihao Cheng 提交者: Zheng Zengkai

file: fix kabi change since add f_ctl_mode

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I53R0H
CVE: NA
backport: openEuler-22.03-LTS

---------------------------
Signed-off-by: NZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: NZhang Yi <yi.zhang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 639a7e8e
...@@ -954,7 +954,6 @@ struct file { ...@@ -954,7 +954,6 @@ struct file {
atomic_long_t f_count; atomic_long_t f_count;
unsigned int f_flags; unsigned int f_flags;
fmode_t f_mode; fmode_t f_mode;
fmode_t f_ctl_mode;
struct mutex f_pos_lock; struct mutex f_pos_lock;
loff_t f_pos; loff_t f_pos;
struct fown_struct f_owner; struct fown_struct f_owner;
...@@ -976,8 +975,14 @@ struct file { ...@@ -976,8 +975,14 @@ struct file {
struct address_space *f_mapping; struct address_space *f_mapping;
errseq_t f_wb_err; errseq_t f_wb_err;
errseq_t f_sb_err; /* for syncfs */ errseq_t f_sb_err; /* for syncfs */
#ifndef __GENKSYMS__
union {
fmode_t f_ctl_mode;
u64 kabi_reserved1;
};
#else
KABI_RESERVE(1) KABI_RESERVE(1)
#endif
} __randomize_layout } __randomize_layout
__attribute__((aligned(4))); /* lest something weird decides that 2 is OK */ __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册