tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull pstore fixes from Kees Cook:

- Rate-limit ECC warnings (Dmitry Osipenko)

- Fix error path check for NULL (Tetsuo Handa)

* tag 'pstore-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore/ram: Rate-limit "uncorrectable error in header" message
pstore: Fix warning in pstore_kill_sb()

Linus Torvalds 8b24ef44 63dcd69d

+2 -2
+1 -1
fs/pstore/inode.c
··· 467 467 static void pstore_kill_sb(struct super_block *sb) 468 468 { 469 469 mutex_lock(&pstore_sb_lock); 470 - WARN_ON(pstore_sb != sb); 470 + WARN_ON(pstore_sb && pstore_sb != sb); 471 471 472 472 kill_litter_super(sb); 473 473 pstore_sb = NULL;
+1 -1
fs/pstore/ram_core.c
··· 246 246 pr_info("error in header, %d\n", numerr); 247 247 prz->corrected_bytes += numerr; 248 248 } else if (numerr < 0) { 249 - pr_info("uncorrectable error in header\n"); 249 + pr_info_ratelimited("uncorrectable error in header\n"); 250 250 prz->bad_blocks++; 251 251 } 252 252