diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-10 10:57:23 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:02 -0400 |
| commit | aab5e0972a32790c0dbfac64929529820114c674 (patch) | |
| tree | 7aacf7c398428dfa46f4d85ef2220228b34f6c35 | |
| parent | 2d9200cfe004b8208a04ea15b3967f9a14135be6 (diff) | |
six locks: Disable percpu read lock mode in userspace
When running in userspace, we currently don't have a real percpu
implementation available - at least in bcachefs-tools, which is where
this code is currently used in userspace.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/six.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/bcachefs/six.c b/fs/bcachefs/six.c index 00580f8ff1c5..7ce45aeaee8d 100644 --- a/fs/bcachefs/six.c +++ b/fs/bcachefs/six.c @@ -870,6 +870,11 @@ void __six_lock_init(struct six_lock *lock, const char *name, lockdep_init_map(&lock->dep_map, name, key, 0); #endif + /* + * Don't assume that we have real percpu variables available in + * userspace: + */ +#ifdef __KERNEL__ if (flags & SIX_LOCK_INIT_PCPU) { /* * We don't return an error here on memory allocation failure @@ -880,5 +885,6 @@ void __six_lock_init(struct six_lock *lock, const char *name, */ lock->readers = alloc_percpu(unsigned); } +#endif } EXPORT_SYMBOL_GPL(__six_lock_init); |