summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/util.c
diff options
context:
space:
mode:
authorAlan Huang <mmpgouride@gmail.com>2025-05-20 15:34:28 +0800
committerKent Overstreet <kent.overstreet@linux.dev>2025-06-11 23:21:30 -0400
commit0acb385ec19c99b213d28a309a941790758c53a8 (patch)
tree1986801130ff4d0ded5ce5e8761cd7eab0b0a8c6 /fs/bcachefs/util.c
parentbcachefs: mark more errors autofix (diff)
downloadlinux-0acb385ec19c99b213d28a309a941790758c53a8.tar.gz
linux-0acb385ec19c99b213d28a309a941790758c53a8.zip
bcachefs: Fix possible console lock involved deadlock
Link: https://lore.kernel.org/all/6822ab02.050a0220.f2294.00cb.GAE@google.com/T/ Reported-by: syzbot+2c3ef91c9523c3d1a25c@syzkaller.appspotmail.com Signed-off-by: Alan Huang <mmpgouride@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/util.c')
-rw-r--r--fs/bcachefs/util.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/bcachefs/util.c b/fs/bcachefs/util.c
index dc3817f545fa..df9a6071fe18 100644
--- a/fs/bcachefs/util.c
+++ b/fs/bcachefs/util.c
@@ -262,8 +262,7 @@ static bool string_is_spaces(const char *str)
return true;
}
-void bch2_print_string_as_lines(const char *prefix, const char *lines,
- bool nonblocking)
+void bch2_print_string_as_lines(const char *prefix, const char *lines)
{
bool locked = false;
const char *p;
@@ -273,12 +272,7 @@ void bch2_print_string_as_lines(const char *prefix, const char *lines,
return;
}
- if (!nonblocking) {
- console_lock();
- locked = true;
- } else {
- locked = console_trylock();
- }
+ locked = console_trylock();
while (*lines) {
p = strchrnul(lines, '\n');