projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'CR_2861_vf2_ts_515_changhuang.liang' into 'vf2-515-devel'
[platform/kernel/linux-starfive.git]
/
block
/
blk-cgroup.c
diff --git
a/block/blk-cgroup.c
b/block/blk-cgroup.c
index
38b9f76
..
9a1c583
100644
(file)
--- a/
block/blk-cgroup.c
+++ b/
block/blk-cgroup.c
@@
-1897,10
+1897,11
@@
void blk_cgroup_bio_start(struct bio *bio)
{
int rwd = blk_cgroup_io_type(bio), cpu;
struct blkg_iostat_set *bis;
{
int rwd = blk_cgroup_io_type(bio), cpu;
struct blkg_iostat_set *bis;
+ unsigned long flags;
cpu = get_cpu();
bis = per_cpu_ptr(bio->bi_blkg->iostat_cpu, cpu);
cpu = get_cpu();
bis = per_cpu_ptr(bio->bi_blkg->iostat_cpu, cpu);
-
u64_stats_update_begin
(&bis->sync);
+
flags = u64_stats_update_begin_irqsave
(&bis->sync);
/*
* If the bio is flagged with BIO_CGROUP_ACCT it means this is a split
/*
* If the bio is flagged with BIO_CGROUP_ACCT it means this is a split
@@
-1912,7
+1913,7
@@
void blk_cgroup_bio_start(struct bio *bio)
}
bis->cur.ios[rwd]++;
}
bis->cur.ios[rwd]++;
- u64_stats_update_end
(&bis->sync
);
+ u64_stats_update_end
_irqrestore(&bis->sync, flags
);
if (cgroup_subsys_on_dfl(io_cgrp_subsys))
cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu);
put_cpu();
if (cgroup_subsys_on_dfl(io_cgrp_subsys))
cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu);
put_cpu();