summaryrefslogtreecommitdiff
path: root/drivers/md/raid5.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2022-01-06 12:36:04 -0700
committerJens Axboe <axboe@kernel.dk>2022-01-06 12:36:04 -0700
commitd85bd8233fff000567cda4e108112bcb33478616 (patch)
tree89489558c2066bef4b7e57130a2110bea5c21195 /drivers/md/raid5.h
parent050f461e28c5d13f327353d660ffad2603ce7ac1 (diff)
parent1745e857e73a2e29379013438ee271e9aadab2e0 (diff)
Merge branch 'md-next' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.17/driversfor-5.17/drivers-2022-01-11for-5.17/drivers
Pull MD updates from Song: "The major changes are: - REQ_NOWAIT support, by Vishal Verma - raid6 benchmark optimization, by Dirk Müller - Fix for acct bioset, by Xiao Ni - Clean up max_queued_requests, by Mariusz Tkaczyk - PREEMPT_RT optimization, by Davidlohr Bueso - Use default_groups in kobj_type, by Greg Kroah-Hartman" * 'md-next' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/song/md: md: use default_groups in kobj_type md: Move alloc/free acct bioset in to personality lib/raid6: Use strict priority ranking for pq gen() benchmarking lib/raid6: skip benchmark of non-chosen xor_syndrome functions md: fix spelling of "its" md: raid456 add nowait support md: raid10 add nowait support md: raid1 add nowait support md: add support for REQ_NOWAIT md: drop queue limitation for RAID1 and RAID10 md/raid5: play nice with PREEMPT_RT
Diffstat (limited to 'drivers/md/raid5.h')
-rw-r--r--drivers/md/raid5.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
index 5c05acf20e1f..9e8486a9e445 100644
--- a/drivers/md/raid5.h
+++ b/drivers/md/raid5.h
@@ -4,6 +4,7 @@
#include <linux/raid/xor.h>
#include <linux/dmaengine.h>
+#include <linux/local_lock.h>
/*
*
@@ -640,7 +641,8 @@ struct r5conf {
* lists and performing address
* conversions
*/
- int scribble_obj_size;
+ int scribble_obj_size;
+ local_lock_t lock;
} __percpu *percpu;
int scribble_disks;
int scribble_sectors;