Skip to content

Commit 2bfedd1

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull followup block layer updates from Jens Axboe: "Two things in this pull request: - A block throttle oops fix (marked for stable) from Thadeu. - The NVMe fixes/features queued up for 3.20, but merged later in the process. From Keith. We should have gotten this merged earlier, we're ironing out the kinks in the process. Will be ready for the initial pull next series" * 'for-linus' of git://git.kernel.dk/linux-block: blk-throttle: check stats_cpu before reading it from sysfs NVMe: Fix potential corruption on sync commands NVMe: Remove unused variables NVMe: Fix scsi mode select llbaa setting NVMe: Fix potential corruption during shutdown NVMe: Asynchronous controller probe NVMe: Register management handle under nvme class NVMe: Update SCSI Inquiry VPD 83h translation NVMe: Metadata format support
2 parents a911dcd + decf6d7 commit 2bfedd1

File tree

5 files changed

+417
-213
lines changed

5 files changed

+417
-213
lines changed

‎block/blk-throttle.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,9 @@ static u64 tg_prfill_cpu_rwstat(struct seq_file *sf,
12921292
struct blkg_rwstat rwstat = { }, tmp;
12931293
int i, cpu;
12941294

1295+
if (tg->stats_cpu == NULL)
1296+
return 0;
1297+
12951298
for_each_possible_cpu(cpu) {
12961299
struct tg_stats_cpu *sc = per_cpu_ptr(tg->stats_cpu, cpu);
12971300

0 commit comments

Comments
 (0)