diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-02 23:52:57 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-13 00:22:30 -0400 |
| commit | 25f8bfe0c7c48fb9734b56ca9146415f056563b3 (patch) | |
| tree | da3a0f5f957a1926444b3939c7d10183acc862e8 | |
| parent | 86c81d7bb00f1e88322f4fe8f9e2797d78b1df76 (diff) | |
Increase MAX_LOCK_DEPTH, bcachefs BTREE_ITER_MAX (do not upstream)
| -rw-r--r-- | fs/bcachefs/btree_types.h | 4 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h index 2a34d76f4f5d..887f6151ef9d 100644 --- a/fs/bcachefs/btree_types.h +++ b/fs/bcachefs/btree_types.h @@ -386,11 +386,7 @@ struct btree_insert_entry { unsigned long ip_allocated; }; -#ifndef CONFIG_LOCKDEP #define BTREE_ITER_MAX 64 -#else -#define BTREE_ITER_MAX 32 -#endif struct btree_trans_commit_hook; typedef int (btree_trans_commit_hook_fn)(struct btree_trans *, struct btree_trans_commit_hook *); diff --git a/include/linux/sched.h b/include/linux/sched.h index f2a56f64f7ff..1ffca6c4f0b6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1162,7 +1162,7 @@ struct task_struct { #endif #ifdef CONFIG_LOCKDEP -# define MAX_LOCK_DEPTH 48UL +# define MAX_LOCK_DEPTH 63UL u64 curr_chain_key; int lockdep_depth; unsigned int lockdep_recursion; |