hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/IB4E8P CVE: NA
--------------------------------
- new field 'cur_ktime' is added to struct blk_plug; - "blk.h" is included from blk-wbt.c; - "blk.h" is included from blk-cgroup.h;
Signed-off-by: Yu Kuai yukuai3@huawei.com --- block/blk-cgroup.h | 3 +++ block/blk-wbt.c | 3 +++ include/linux/blkdev.h | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 1ee4bda5c641..82c800699da8 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -19,7 +19,10 @@ #include <linux/kthread.h> #include <linux/blk-mq.h> #include <linux/llist.h> + +#ifndef __GENKSYMS__ #include "blk.h" +#endif
struct blkcg_gq; struct blkg_policy_data; diff --git a/block/blk-wbt.c b/block/blk-wbt.c index a212120591c7..4933a7738ebd 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -29,7 +29,10 @@ #include "blk-wbt.h" #include "blk-rq-qos.h" #include "elevator.h" + +#ifndef __GENKSYMS__ #include "blk.h" +#endif
#define CREATE_TRACE_POINTS #include <trace/events/wbt.h> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 3a80bedef6ee..b00846ed412c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1032,7 +1032,6 @@ struct blk_plug {
/* if ios_left is > 1, we can batch tag/rq allocations */ struct request *cached_rq; - u64 cur_ktime; unsigned short nr_ios;
unsigned short rq_count; @@ -1042,7 +1041,7 @@ struct blk_plug {
struct list_head cb_list; /* md requires an unplug callback */
- KABI_RESERVE(1) + KABI_USE(1, u64 cur_ktime) KABI_RESERVE(2) KABI_RESERVE(3) };