diff options
| author | Kees Cook | 2018-11-01 22:08:07 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-11 12:20:52 +0200 |
| commit | c63ce7166dafd82c679873107ec649ff9f768d1e (patch) | |
| tree | b0c6a7712189cc21e555685cc0d9f2e2c3f612f1 /fs/pstore | |
| parent | fuse: fallocate: fix return with locked inode (diff) | |
| download | kernel-qcow2-linux-c63ce7166dafd82c679873107ec649ff9f768d1e.tar.gz kernel-qcow2-linux-c63ce7166dafd82c679873107ec649ff9f768d1e.tar.xz kernel-qcow2-linux-c63ce7166dafd82c679873107ec649ff9f768d1e.zip | |
pstore: Remove needless lock during console writes
commit b77fa617a2ff4d6beccad3d3d4b3a1f2d10368aa upstream.
Since the console writer does not use the preallocated crash dump buffer
any more, there is no reason to perform locking around it.
Fixes: 70ad35db3321 ("pstore: Convert console write to use ->write_buf")
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/pstore')
| -rw-r--r-- | fs/pstore/platform.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index b821054ca3ed..805283b5385d 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -476,31 +476,14 @@ static void pstore_unregister_kmsg(void) #ifdef CONFIG_PSTORE_CONSOLE static void pstore_console_write(struct console *con, const char *s, unsigned c) { - const char *e = s + c; + struct pstore_record record; - while (s < e) { - struct pstore_record record; - unsigned long flags; - - pstore_record_init(&record, psinfo); - record.type = PSTORE_TYPE_CONSOLE; - - if (c > psinfo->bufsize) - c = psinfo->bufsize; + pstore_record_init(&record, psinfo); + record.type = PSTORE_TYPE_CONSOLE; - if (oops_in_progress) { - if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) - break; - } else { - spin_lock_irqsave(&psinfo->buf_lock, flags); - } - record.buf = (char *)s; - record.size = c; - psinfo->write(&record); - spin_unlock_irqrestore(&psinfo->buf_lock, flags); - s += c; - c = e - s; - } + record.buf = (char *)s; + record.size = c; + psinfo->write(&record); } static struct console pstore_console = { |