Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-5.15-2021-10-22' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Fix for the cgroup code not ussing irq safe stats updates, and one fix
for an error handling condition in add_partition()"
* tag 'block-5.15-2021-10-22' of git://git.kernel.dk/linux-block:
block: fix incorrect references to disk objects
blk-cgroup: blk_cgroup_bio_start() should use irq-safe operations on blkg->iostat_cpu
+4
-2
+3
-2
block/blk-cgroup.c
+3
-2
block/blk-cgroup.c
···
1897
1897
{
1898
1898
int rwd = blk_cgroup_io_type(bio), cpu;
1899
1899
struct blkg_iostat_set *bis;
1900
+
unsigned long flags;
1900
1901
1901
1902
cpu = get_cpu();
1902
1903
bis = per_cpu_ptr(bio->bi_blkg->iostat_cpu, cpu);
1903
-
u64_stats_update_begin(&bis->sync);
1904
+
flags = u64_stats_update_begin_irqsave(&bis->sync);
1904
1905
1905
1906
/*
1906
1907
* If the bio is flagged with BIO_CGROUP_ACCT it means this is a split
···
1913
1912
}
1914
1913
bis->cur.ios[rwd]++;
1915
1914
1916
-
u64_stats_update_end(&bis->sync);
1915
+
u64_stats_update_end_irqrestore(&bis->sync, flags);
1917
1916
if (cgroup_subsys_on_dfl(io_cgrp_subsys))
1918
1917
cgroup_rstat_updated(bio->bi_blkg->blkcg->css.cgroup, cpu);
1919
1918
put_cpu();