Commit fc400d5f authored by John Ogness's avatar John Ogness Committed by Petr Mladek

printk: Add @flags argument for console_is_usable()

The caller of console_is_usable() usually needs @console->flags
for its own checks. Rather than having console_is_usable() read
its own copy, make the caller pass in the @flags. This also
ensures that the caller saw the same @flags value.
Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20240820063001.36405-19-john.ogness@linutronix.deSigned-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 20846d1c
...@@ -89,13 +89,9 @@ void nbcon_free(struct console *con); ...@@ -89,13 +89,9 @@ void nbcon_free(struct console *con);
* records. Note that this function does not consider the current context, * records. Note that this function does not consider the current context,
* which can also play a role in deciding if @con can be used to print * which can also play a role in deciding if @con can be used to print
* records. * records.
*
* Requires the console_srcu_read_lock.
*/ */
static inline bool console_is_usable(struct console *con) static inline bool console_is_usable(struct console *con, short flags)
{ {
short flags = console_srcu_read_flags(con);
if (!(flags & CON_ENABLED)) if (!(flags & CON_ENABLED))
return false; return false;
...@@ -141,7 +137,7 @@ static inline void nbcon_seq_force(struct console *con, u64 seq) { } ...@@ -141,7 +137,7 @@ static inline void nbcon_seq_force(struct console *con, u64 seq) { }
static inline bool nbcon_alloc(struct console *con) { return false; } static inline bool nbcon_alloc(struct console *con) { return false; }
static inline void nbcon_free(struct console *con) { } static inline void nbcon_free(struct console *con) { }
static inline bool console_is_usable(struct console *con) { return false; } static inline bool console_is_usable(struct console *con, short flags) { return false; }
#endif /* CONFIG_PRINTK */ #endif /* CONFIG_PRINTK */
......
...@@ -3012,9 +3012,10 @@ static bool console_flush_all(bool do_cond_resched, u64 *next_seq, bool *handove ...@@ -3012,9 +3012,10 @@ static bool console_flush_all(bool do_cond_resched, u64 *next_seq, bool *handove
cookie = console_srcu_read_lock(); cookie = console_srcu_read_lock();
for_each_console_srcu(con) { for_each_console_srcu(con) {
short flags = console_srcu_read_flags(con);
bool progress; bool progress;
if (!console_is_usable(con)) if (!console_is_usable(con, flags))
continue; continue;
any_usable = true; any_usable = true;
...@@ -3925,7 +3926,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre ...@@ -3925,7 +3926,7 @@ static bool __pr_flush(struct console *con, int timeout_ms, bool reset_on_progre
* that they make forward progress, so only increment * that they make forward progress, so only increment
* @diff for usable consoles. * @diff for usable consoles.
*/ */
if (!console_is_usable(c)) if (!console_is_usable(c, flags))
continue; continue;
if (flags & CON_NBCON) { if (flags & CON_NBCON) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment