projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
block
/
blk-wbt.c
diff --git
a/block/blk-wbt.c
b/block/blk-wbt.c
index
3ed71b8
..
874c1c3
100644
(file)
--- a/
block/blk-wbt.c
+++ b/
block/blk-wbt.c
@@
-97,7
+97,7
@@
static void wb_timestamp(struct rq_wb *rwb, unsigned long *var)
*/
static bool wb_recent_wait(struct rq_wb *rwb)
{
*/
static bool wb_recent_wait(struct rq_wb *rwb)
{
- struct bdi_writeback *wb = &rwb->rqos.q->
backing_dev_info
->wb;
+ struct bdi_writeback *wb = &rwb->rqos.q->
disk->bdi
->wb;
return time_before(jiffies, wb->dirty_sleep + HZ);
}
return time_before(jiffies, wb->dirty_sleep + HZ);
}
@@
-234,7
+234,7
@@
enum {
static int latency_exceeded(struct rq_wb *rwb, struct blk_rq_stat *stat)
{
static int latency_exceeded(struct rq_wb *rwb, struct blk_rq_stat *stat)
{
- struct backing_dev_info *bdi = rwb->rqos.q->
backing_dev_info
;
+ struct backing_dev_info *bdi = rwb->rqos.q->
disk->bdi
;
struct rq_depth *rqd = &rwb->rq_depth;
u64 thislat;
struct rq_depth *rqd = &rwb->rq_depth;
u64 thislat;
@@
-287,7
+287,7
@@
static int latency_exceeded(struct rq_wb *rwb, struct blk_rq_stat *stat)
static void rwb_trace_step(struct rq_wb *rwb, const char *msg)
{
static void rwb_trace_step(struct rq_wb *rwb, const char *msg)
{
- struct backing_dev_info *bdi = rwb->rqos.q->
backing_dev_info
;
+ struct backing_dev_info *bdi = rwb->rqos.q->
disk->bdi
;
struct rq_depth *rqd = &rwb->rq_depth;
trace_wbt_step(bdi, msg, rqd->scale_step, rwb->cur_win_nsec,
struct rq_depth *rqd = &rwb->rq_depth;
trace_wbt_step(bdi, msg, rqd->scale_step, rwb->cur_win_nsec,
@@
-359,7
+359,7
@@
static void wb_timer_fn(struct blk_stat_callback *cb)
status = latency_exceeded(rwb, cb->stat);
status = latency_exceeded(rwb, cb->stat);
- trace_wbt_timer(rwb->rqos.q->
backing_dev_info
, status, rqd->scale_step,
+ trace_wbt_timer(rwb->rqos.q->
disk->bdi
, status, rqd->scale_step,
inflight);
/*
inflight);
/*