diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-05 17:21:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-05 17:21:25 -0800 |
| commit | 8b24ef44789c990329a15a287ae0e634720745e8 (patch) | |
| tree | cf8e5d3d2128af921a0cfa48e0e9a658e36bac27 | |
| parent | 63dcd69d9b497c045c4169cddc6a24e1a7428f88 (diff) | |
| parent | 7db688e99c0f770ae73e0f1f3fb67f9b64266445 (diff) | |
| download | lwn-8b24ef44789c990329a15a287ae0e634720745e8.tar.gz lwn-8b24ef44789c990329a15a287ae0e634720745e8.zip | |
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()
| -rw-r--r-- | fs/pstore/inode.c | 2 | ||||
| -rw-r--r-- | fs/pstore/ram_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c index 93a217e4f563..14658b009f1b 100644 --- a/fs/pstore/inode.c +++ b/fs/pstore/inode.c @@ -467,7 +467,7 @@ static struct dentry *pstore_mount(struct file_system_type *fs_type, static void pstore_kill_sb(struct super_block *sb) { mutex_lock(&pstore_sb_lock); - WARN_ON(pstore_sb != sb); + WARN_ON(pstore_sb && pstore_sb != sb); kill_litter_super(sb); pstore_sb = NULL; diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index aa8e0b65ff1a..fff363bfd484 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -246,7 +246,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, pr_info("error in header, %d\n", numerr); prz->corrected_bytes += numerr; } else if (numerr < 0) { - pr_info("uncorrectable error in header\n"); + pr_info_ratelimited("uncorrectable error in header\n"); prz->bad_blocks++; } |