diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-08-08 14:03:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-08-08 14:04:17 -0700 |
| commit | e47fd9beb1cec00f43077d6b6238c8d30bd03ecf (patch) | |
| tree | 504747e4a88042565ad7957260915242ff687b61 /fs/bcachefs/io_misc.c | |
| parent | 91d516d4de48532d967a77967834e00c8c53dfe6 (diff) | |
| parent | ee9a43b7cfe2d8a3520335fea7d8ce71b8cabd9d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Link: https://patch.msgid.link/20240808170148.3629934-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/bcachefs/io_misc.c')
| -rw-r--r-- | fs/bcachefs/io_misc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/bcachefs/io_misc.c b/fs/bcachefs/io_misc.c index 2cf6297756f8..177ed331c00b 100644 --- a/fs/bcachefs/io_misc.c +++ b/fs/bcachefs/io_misc.c @@ -126,11 +126,7 @@ err_noprint: if (closure_nr_remaining(&cl) != 1) { bch2_trans_unlock_long(trans); - - if (closure_sync_timeout(&cl, HZ * 10)) { - bch2_print_allocator_stuck(c); - closure_sync(&cl); - } + bch2_wait_on_allocator(c, &cl); } return ret; |