diff options
Diffstat (limited to 'fs/pstore/platform.c')
| -rw-r--r-- | fs/pstore/platform.c | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 86d1038..5ea2e77 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -96,27 +96,6 @@ static const char *get_reason_str(enum kmsg_dump_reason reason) } } -bool pstore_cannot_block_path(enum kmsg_dump_reason reason) -{ - /* - * In case of NMI path, pstore shouldn't be blocked - * regardless of reason. - */ - if (in_nmi()) - return true; - - switch (reason) { - /* In panic case, other cpus are stopped by smp_send_stop(). */ - case KMSG_DUMP_PANIC: - /* Emergency restart shouldn't be blocked by spin lock. */ - case KMSG_DUMP_EMERG: - return true; - default: - return false; - } -} -EXPORT_SYMBOL_GPL(pstore_cannot_block_path); - /* * callback from kmsg_dump. (s2,l2) has the most recently * written bytes, older bytes are in (s1,l1). Save as much @@ -135,12 +114,10 @@ static void pstore_dump(struct kmsg_dumper *dumper, why = get_reason_str(reason); - if (pstore_cannot_block_path(reason)) { - is_locked = spin_trylock_irqsave(&psinfo->buf_lock, flags); - if (!is_locked) { - pr_err("pstore dump routine blocked in %s path, may corrupt error record\n" - , in_nmi() ? "NMI" : why); - } + if (in_nmi()) { + is_locked = spin_trylock(&psinfo->buf_lock); + if (!is_locked) + pr_err("pstore dump routine blocked in NMI, may corrupt error record\n"); } else spin_lock_irqsave(&psinfo->buf_lock, flags); oopscount++; @@ -166,9 +143,9 @@ static void pstore_dump(struct kmsg_dumper *dumper, total += hsize + len; part++; } - if (pstore_cannot_block_path(reason)) { + if (in_nmi()) { if (is_locked) - spin_unlock_irqrestore(&psinfo->buf_lock, flags); + spin_unlock(&psinfo->buf_lock); } else spin_unlock_irqrestore(&psinfo->buf_lock, flags); } |