Commit 8b24ef44 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 63dcd69d 7db688e9
...@@ -467,7 +467,7 @@ static struct dentry *pstore_mount(struct file_system_type *fs_type, ...@@ -467,7 +467,7 @@ static struct dentry *pstore_mount(struct file_system_type *fs_type,
static void pstore_kill_sb(struct super_block *sb) static void pstore_kill_sb(struct super_block *sb)
{ {
mutex_lock(&pstore_sb_lock); mutex_lock(&pstore_sb_lock);
WARN_ON(pstore_sb != sb); WARN_ON(pstore_sb && pstore_sb != sb);
kill_litter_super(sb); kill_litter_super(sb);
pstore_sb = NULL; pstore_sb = NULL;
......
...@@ -246,7 +246,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, ...@@ -246,7 +246,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz,
pr_info("error in header, %d\n", numerr); pr_info("error in header, %d\n", numerr);
prz->corrected_bytes += numerr; prz->corrected_bytes += numerr;
} else if (numerr < 0) { } else if (numerr < 0) {
pr_info("uncorrectable error in header\n"); pr_info_ratelimited("uncorrectable error in header\n");
prz->bad_blocks++; prz->bad_blocks++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment