Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63ce716 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

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: 70ad35db ("pstore: Convert console write to use ->write_buf")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3b8b4ad

fs/pstore/platform.c

+6 −23
Original line number Diff line number Diff line
@@ -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;



	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;



		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;

	}

}



static struct console pstore_console = {