aboutsummaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/btree_trans_commit.c
diff options
context:
space:
mode:
authorKent Overstreet <[email protected]>2025-01-21 22:42:25 +0000
committerKent Overstreet <[email protected]>2025-01-21 23:32:05 +0000
commit2c5d8a8347a8ea8c243245e2ed8d87dfbf9f54fb (patch)
treee6f98cc208966943bf1ae10fcaa0e3e2f0399712 /fs/bcachefs/btree_trans_commit.c
parentbcachefs: Reduce stack frame size of __bch2_str_hash_check_key() (diff)
downloadkernel-2c5d8a8347a8ea8c243245e2ed8d87dfbf9f54fb.tar.gz
kernel-2c5d8a8347a8ea8c243245e2ed8d87dfbf9f54fb.zip
bcachefs: "Journal stuck" timeout now takes into account device latency
If a block device (e.g. your typical consumer SSD) is taking multiple seconds for IOs (typically flushes), we don't want to emit the "journal stuck" message prematurely. Also, make sure to drop the btree_trans srcu lock if we're blocking for more than a second. Signed-off-by: Kent Overstreet <[email protected]>
Diffstat (limited to 'fs/bcachefs/btree_trans_commit.c')
-rw-r--r--fs/bcachefs/btree_trans_commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
index 6b79b672e0b1..2760dd9569ed 100644
--- a/fs/bcachefs/btree_trans_commit.c
+++ b/fs/bcachefs/btree_trans_commit.c
@@ -348,7 +348,7 @@ static __always_inline int bch2_trans_journal_res_get(struct btree_trans *trans,
unsigned flags)
{
return bch2_journal_res_get(&trans->c->journal, &trans->journal_res,
- trans->journal_u64s, flags);
+ trans->journal_u64s, flags, trans);
}
#define JSET_ENTRY_LOG_U64s 4