Commit fba98008 authored by Yu Kuai's avatar Yu Kuai
Browse files

block: fix kabi broken after caching ns time in blk_plug 

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: default avatarYu Kuai <yukuai3@huawei.com>
parent d37631e9

block/blk-cgroup.h

+3 −0
Original line number Diff line number Diff line
@@ -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;

block/blk-wbt.c

+3 −0
Original line number Diff line number Diff line
@@ -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>

include/linux/blkdev.h

+1 −2
Original line number Diff line number Diff line
@@ -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)

};