diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-02 23:52:57 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-21 03:32:17 -0400 |
| commit | 8c312d0195bf0f40e9350b6d45513afee050ce6e (patch) | |
| tree | 38d77524d6621f325e3445aa6355f274b4ccd456 | |
| parent | 5ec09018877f19f1264248565551f166de8931cc (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; |