summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-11-24 12:13:04 +0100
committerShaohua Li <shli@fb.com>2016-11-28 06:38:08 +0100
commitd3014e21e18bfaf5b22144a45c399c8eb21aaba9 (patch)
treecbc85c26d05b89c09983ca4704627caad014d8ef
parentmd/r5cache: handle alloc_page failure (diff)
downloadlinux-d3014e21e18bfaf5b22144a45c399c8eb21aaba9.tar.xz
linux-d3014e21e18bfaf5b22144a45c399c8eb21aaba9.zip
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") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r--drivers/md/raid5-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 5d3d238921e8..874749dc7648 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -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,