Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685dbcaa authored by Anna-Maria Gleixner's avatar Anna-Maria Gleixner Committed by Shaohua Li
Browse files

drivers/md/raid5: Use irqsave variant of atomic_dec_and_lock() 



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.

Cc: Shaohua Li <shli@kernel.org>
Cc: linux-raid@vger.kernel.org
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAnna-Maria Gleixner <anna-maria@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent ebc7709f

drivers/md/raid5.c

+2 −3
Original line number Diff line number Diff line
@@ -409,17 +409,16 @@ void raid5_release_stripe(struct stripe_head *sh) 
		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);

	}

}



static inline void remove_hash(struct stripe_head *sh)

{