From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-kernel@vger.kernel.org,
Steven Rostedt <rostedt@goodmis.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: [PATCH v5 6/7] console: Don't notify user space when unregister non-listed console
Date: Mon, 3 Feb 2020 15:31:29 +0200 [thread overview]
Message-ID: <20200203133130.11591-6-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200203133130.11591-1-andriy.shevchenko@linux.intel.com>
If console is not on the list then there is nothing for us to do
and sysfs notify is pointless.
Note, that nr_ext_console_drivers is being changed only for listed consoles.
Suggested-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v5: new patch
kernel/printk/printk.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 5fdae891a4cd..abd9b92ae0e3 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2843,7 +2843,10 @@ int unregister_console(struct console *console)
}
}
- if (!res && (console->flags & CON_EXTENDED))
+ if (res)
+ goto out_disable_unlock;
+
+ if (console->flags & CON_EXTENDED)
nr_ext_console_drivers--;
/*
@@ -2856,6 +2859,13 @@ int unregister_console(struct console *console)
console->flags &= ~CON_ENABLED;
console_unlock();
console_sysfs_notify();
+
+ return res;
+
+out_disable_unlock:
+ console->flags &= ~CON_ENABLED;
+ console_unlock();
+
return res;
}
EXPORT_SYMBOL(unregister_console);
--
2.24.1
next prev parent reply other threads:[~2020-02-03 13:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 13:31 [PATCH v5 1/7] console: Don't perform test for CON_BRL flag Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 2/7] console: Drop double check for console_drivers being non-NULL Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 3/7] console: Use for_each_console() helper in unregister_console() Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 4/7] console: Drop misleading comment Andy Shevchenko
2020-02-03 13:31 ` [PATCH v5 5/7] console: Avoid positive return code from unregister_console() Andy Shevchenko
2020-02-03 13:31 ` Andy Shevchenko [this message]
2020-02-03 13:31 ` [PATCH v5 7/7] console: Introduce ->exit() callback Andy Shevchenko
2020-02-04 1:34 ` [PATCH v5 1/7] console: Don't perform test for CON_BRL flag Sergey Senozhatsky
2020-02-11 11:32 ` Petr Mladek
2020-02-11 12:54 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200203133130.11591-6-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sergey.senozhatsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).