hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IAGRKP CVE: NA ---------------------------------------- The field 'blk_trace_mutex' is moved and renamed. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- include/linux/blkdev.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9948b3248e96..e6d199cdfd4c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -643,6 +643,14 @@ struct request_queue { int node; #ifdef CONFIG_BLK_DEV_IO_TRACE struct blk_trace __rcu *blk_trace; +#endif + /* + * Serializes all debugfs metadata operations using the above dentries. + */ +#ifndef __GENKSYMS__ + struct mutex debugfs_mutex; +#else + struct mutex blk_trace_mutex; #endif /* * for flush operations @@ -690,10 +698,6 @@ struct request_queue { struct dentry *debugfs_dir; struct dentry *sched_debugfs_dir; - /* - * Serializes all debugfs metadata operations using the above dentries. - */ - struct mutex debugfs_mutex; bool mq_sysfs_init_done; -- 2.39.2