38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
|
Date: Fri, 4 May 2018 17:45:32 +0200
|
|
Subject: [PATCH 2/3] drivers/md/raid5: Use irqsave variant of
|
|
atomic_dec_and_lock()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.18/older/patches-4.18.5-rt3.tar.xz
|
|
|
|
The irqsave variant of atomic_dec_and_lock handles irqsave/restore when
|
|
taking/releasing the spin lock. With this variant the call of
|
|
local_irq_save is no longer required.
|
|
|
|
Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
drivers/md/raid5.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/md/raid5.c
|
|
+++ b/drivers/md/raid5.c
|
|
@@ -409,16 +409,15 @@ void raid5_release_stripe(struct stripe_
|
|
md_wakeup_thread(conf->mddev->thread);
|
|
return;
|
|
slow_path:
|
|
- local_irq_save(flags);
|
|
/* we are ok here if STRIPE_ON_RELEASE_LIST is set or not */
|
|
- if (atomic_dec_and_lock(&sh->count, &conf->device_lock)) {
|
|
+ if (atomic_dec_and_lock_irqsave(&sh->count, &conf->device_lock, flags)) {
|
|
INIT_LIST_HEAD(&list);
|
|
hash = sh->hash_lock_index;
|
|
do_release_stripe(conf, sh, &list);
|
|
spin_unlock(&conf->device_lock);
|
|
release_inactive_stripe_list(conf, &list, hash);
|
|
+ local_irq_restore(flags);
|
|
}
|
|
- local_irq_restore(flags);
|
|
}
|
|
|
|
static inline void remove_hash(struct stripe_head *sh)
|