Skip to contentSkip to conversation

md/r5cache: enable IRQs on error path

PATCH Applied Dan Carpenter 2 participants 2 messages Nov 24, 2016 – Nov 28, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 md/r5cache: enable IRQs on error path

We need to re-enable the IRQs here before returning.

Fixes a39f7afde358 ("md/r5cache: write-out phase and reclaim support")
drivers/md/raid5-cache.c +1 -1
index 2a60ce4..6610134 100644
@@ -1029,7 +1029,7 @@ static sector_t r5c_calculate_new_cp(struct r5conf *conf)
 	spin_lock_irqsave(&log->stripe_in_journal_lock, flags);
 	if (list_empty(&conf->log->stripe_in_journal_list)) {
 		/* all stripes flushed */
-		spin_unlock(&log->stripe_in_journal_lock);
+		spin_unlock_irqrestore(&log->stripe_in_journal_lock, flags);
 		return log->next_checkpoint;
 	}
 	sh = list_first_entry(&conf->log->stripe_in_journal_list,
Applied
#1 lore raw
Quoted 4 lines · Dan Carpenter

We need to re-enable the IRQs here before returning.

Fixes a39f7afde358 ("md/r5cache: write-out phase and reclaim support")

Applied, thanks!

Quoted 13 lines
drivers/md/raid5-cache.c +1 -1
index 2a60ce4..6610134 100644
@@ -1029,7 +1029,7 @@ static sector_t r5c_calculate_new_cp(struct r5conf *conf)
 	spin_lock_irqsave(&log->stripe_in_journal_lock, flags);
 	if (list_empty(&conf->log->stripe_in_journal_list)) {
 		/* all stripes flushed */
-		spin_unlock(&log->stripe_in_journal_lock);
+		spin_unlock_irqrestore(&log->stripe_in_journal_lock, flags);
 		return log->next_checkpoint;
 	}
 	sh = list_first_entry(&conf->log->stripe_in_journal_list,